forked from Archive/PX4-Autopilot
move launchdetection lib to fw_pos_control_l1
This commit is contained in:
parent
d646abcee7
commit
6a4ef78111
|
@ -115,7 +115,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -127,7 +127,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -84,7 +84,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
lib/mixer
|
lib/mixer
|
||||||
|
|
|
@ -130,7 +130,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -137,7 +137,6 @@ set(config_module_list
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/conversion
|
lib/conversion
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -109,7 +109,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -143,7 +143,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -128,7 +128,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -144,7 +144,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -136,7 +136,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -136,7 +136,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -137,7 +137,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -115,7 +115,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -91,7 +91,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -77,7 +77,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
lib/mixer
|
lib/mixer
|
||||||
|
|
|
@ -85,7 +85,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -84,7 +84,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -97,7 +97,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
lib/mathlib/math/filter
|
lib/mathlib/math/filter
|
||||||
|
|
|
@ -122,7 +122,6 @@ set(config_module_list
|
||||||
lib/ecl
|
lib/ecl
|
||||||
lib/geo
|
lib/geo
|
||||||
lib/geo_lookup
|
lib/geo_lookup
|
||||||
lib/launchdetection
|
|
||||||
lib/led
|
lib/led
|
||||||
lib/mixer
|
lib/mixer
|
||||||
lib/mathlib
|
lib/mathlib
|
||||||
|
|
|
@ -30,6 +30,9 @@
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
# POSSIBILITY OF SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
|
add_subdirectory(launchdetection)
|
||||||
|
|
||||||
px4_add_module(
|
px4_add_module(
|
||||||
MODULE modules__fw_pos_control_l1
|
MODULE modules__fw_pos_control_l1
|
||||||
MAIN fw_pos_control_l1
|
MAIN fw_pos_control_l1
|
||||||
|
@ -39,8 +42,7 @@ px4_add_module(
|
||||||
FixedwingPositionControl.cpp
|
FixedwingPositionControl.cpp
|
||||||
Landingslope.cpp
|
Landingslope.cpp
|
||||||
DEPENDS
|
DEPENDS
|
||||||
platforms__common
|
|
||||||
git_ecl
|
git_ecl
|
||||||
lib__ecl
|
lib__ecl
|
||||||
|
launchdetection
|
||||||
)
|
)
|
||||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
|
||||||
|
|
|
@ -56,12 +56,12 @@
|
||||||
#include <cfloat>
|
#include <cfloat>
|
||||||
|
|
||||||
#include "Landingslope.hpp"
|
#include "Landingslope.hpp"
|
||||||
|
#include "launchdetection/LaunchDetector.h"
|
||||||
|
|
||||||
#include <drivers/drv_hrt.h>
|
#include <drivers/drv_hrt.h>
|
||||||
#include <ecl/l1/ecl_l1_pos_controller.h>
|
#include <ecl/l1/ecl_l1_pos_controller.h>
|
||||||
#include <ecl/tecs/tecs.h>
|
#include <ecl/tecs/tecs.h>
|
||||||
#include <geo/geo.h>
|
#include <geo/geo.h>
|
||||||
#include <launchdetection/LaunchDetector.h>
|
|
||||||
#include <mathlib/mathlib.h>
|
#include <mathlib/mathlib.h>
|
||||||
#include <runway_takeoff/RunwayTakeoff.h>
|
#include <runway_takeoff/RunwayTakeoff.h>
|
||||||
#include <systemlib/perf_counter.h>
|
#include <systemlib/perf_counter.h>
|
||||||
|
|
|
@ -30,13 +30,8 @@
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
# POSSIBILITY OF SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
############################################################################
|
############################################################################
|
||||||
px4_add_module(
|
|
||||||
MODULE lib__launchdetection
|
px4_add_library(launchdetection
|
||||||
COMPILE_FLAGS
|
|
||||||
SRCS
|
|
||||||
LaunchDetector.cpp
|
LaunchDetector.cpp
|
||||||
CatapultLaunchMethod.cpp
|
CatapultLaunchMethod.cpp
|
||||||
DEPENDS
|
)
|
||||||
platforms__common
|
|
||||||
)
|
|
||||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
|
Loading…
Reference in New Issue