move launchdetection lib to fw_pos_control_l1

7 years ago · 6a4ef78111
28 changed files with 10 additions and 32 deletions
--- a/cmake/configs/nuttx_aerocore2_default.cmake
+++ b/cmake/configs/nuttx_aerocore2_default.cmake
@ -115,7 +115,6 @@ set(config_module_list
				@@ -115,7 +115,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_auav-x21_default.cmake
+++ b/cmake/configs/nuttx_auav-x21_default.cmake
@ -127,7 +127,6 @@ set(config_module_list
				@@ -127,7 +127,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_crazyflie_default.cmake
+++ b/cmake/configs/nuttx_crazyflie_default.cmake
@ -84,7 +84,6 @@ set(config_module_list
				@@ -84,7 +84,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/mathlib
 	lib/mathlib/math/filter
 	lib/mixer
--- a/cmake/configs/nuttx_mindpx-v2_default.cmake
+++ b/cmake/configs/nuttx_mindpx-v2_default.cmake
@ -130,7 +130,6 @@ set(config_module_list
				@@ -130,7 +130,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_nxphlite-v3_default.cmake
+++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake
@ -137,7 +137,6 @@ set(config_module_list
				@@ -137,7 +137,6 @@ set(config_module_list
 	lib/geo
 	lib/geo_lookup
 	lib/conversion
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake
+++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake
@ -109,7 +109,6 @@ set(config_module_list
				@@ -109,7 +109,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@ -143,7 +143,6 @@ set(config_module_list
				@@ -143,7 +143,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4fmu-v2_test.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake
@ -128,7 +128,6 @@ set(config_module_list
				@@ -128,7 +128,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4fmu-v3_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake
@ -144,7 +144,6 @@ set(config_module_list
				@@ -144,7 +144,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@ -136,7 +136,6 @@ set(config_module_list
				@@ -136,7 +136,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
@ -136,7 +136,6 @@ set(config_module_list
				@@ -136,7 +136,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4fmu-v5_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake
@ -137,7 +137,6 @@ set(config_module_list
				@@ -137,7 +137,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
+++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
@ -115,7 +115,6 @@ set(config_module_list
				@@ -115,7 +115,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/nuttx_tap-v1_default.cmake
+++ b/cmake/configs/nuttx_tap-v1_default.cmake
@ -91,7 +91,6 @@ set(config_module_list
				@@ -91,7 +91,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/posix_bebop_default.cmake
+++ b/cmake/configs/posix_bebop_default.cmake
@ -77,7 +77,6 @@ set(config_module_list
				@@ -77,7 +77,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/mathlib
 	lib/mathlib/math/filter
 	lib/mixer
--- a/cmake/configs/posix_ocpoc_cross.cmake
+++ b/cmake/configs/posix_ocpoc_cross.cmake
@ -85,7 +85,6 @@ set(config_module_list
				@@ -85,7 +85,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/posix_ocpoc_ubuntu.cmake
+++ b/cmake/configs/posix_ocpoc_ubuntu.cmake
@ -84,7 +84,6 @@ set(config_module_list
				@@ -84,7 +84,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/posix_rpi_common.cmake
+++ b/cmake/configs/posix_rpi_common.cmake
@ -97,7 +97,6 @@ set(config_module_list
				@@ -97,7 +97,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mathlib
 	lib/mathlib/math/filter
--- a/cmake/configs/posix_sitl_default.cmake
+++ b/cmake/configs/posix_sitl_default.cmake
@ -122,7 +122,6 @@ set(config_module_list
				@@ -122,7 +122,6 @@ set(config_module_list
 	lib/ecl
 	lib/geo
 	lib/geo_lookup
-	lib/launchdetection
 	lib/led
 	lib/mixer
 	lib/mathlib
--- a/src/modules/fw_pos_control_l1/CMakeLists.txt
+++ b/src/modules/fw_pos_control_l1/CMakeLists.txt
@ -30,6 +30,9 @@
				@@ -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(
				@@ -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 :
--- a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
+++ b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
@ -56,12 +56,12 @@
				@@ -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>
--- a/src/modules/fw_pos_control_l1/launchdetection/CMakeLists.txt
+++ b/src/modules/fw_pos_control_l1/launchdetection/CMakeLists.txt
@ -30,13 +30,8 @@
				@@ -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
+)
--- a/src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.cpp
+++ b/src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.cpp
--- a/src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.h
+++ b/src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.h
--- a/src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.cpp
+++ b/src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.cpp
--- a/src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.h
+++ b/src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.h
--- a/src/modules/fw_pos_control_l1/launchdetection/LaunchMethod.h
+++ b/src/modules/fw_pos_control_l1/launchdetection/LaunchMethod.h
--- a/src/modules/fw_pos_control_l1/launchdetection/launchdetection_params.c
+++ b/src/modules/fw_pos_control_l1/launchdetection/launchdetection_params.c