diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index 3d201edd84..08603c73fd 100644 --- a/cmake/configs/nuttx_aerocore2_default.cmake +++ b/cmake/configs/nuttx_aerocore2_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake index e8fb2875bc..58eada4c6b 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/cmake/configs/nuttx_auav-x21_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake index e976f90303..8b114584a1 100644 --- a/cmake/configs/nuttx_crazyflie_default.cmake +++ b/cmake/configs/nuttx_crazyflie_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index 9f5486fd3b..9137019c9c 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake index e298abbfd0..dc05fa3f1e 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake index 46529d343c..f161c41f02 100644 --- 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 lib/ecl lib/geo lib/geo_lookup - lib/launchdetection lib/led lib/mathlib lib/mathlib/math/filter diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index 3074954189..978efe6a3c 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake index 936403269f..be7ef479f3 100644 --- a/cmake/configs/nuttx_px4fmu-v2_test.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake @@ -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 diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake index 940216d181..123e7b3c6f 100644 --- a/cmake/configs/nuttx_px4fmu-v3_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake index ae7886af1e..81558300a5 100644 --- a/cmake/configs/nuttx_px4fmu-v4_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake index c07d33756c..57e7bc9679 100644 --- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake index 72405c8959..be1537f9df 100644 --- a/cmake/configs/nuttx_px4fmu-v5_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake index 353de186e9..8e2743480b 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake @@ -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 diff --git a/cmake/configs/nuttx_tap-v1_default.cmake b/cmake/configs/nuttx_tap-v1_default.cmake index a9474f0038..8666d13315 100644 --- a/cmake/configs/nuttx_tap-v1_default.cmake +++ b/cmake/configs/nuttx_tap-v1_default.cmake @@ -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 diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake index cbca184cde..0dee4861e2 100644 --- a/cmake/configs/posix_bebop_default.cmake +++ b/cmake/configs/posix_bebop_default.cmake @@ -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 diff --git a/cmake/configs/posix_ocpoc_cross.cmake b/cmake/configs/posix_ocpoc_cross.cmake index 47ae19d24e..dcf29788b0 100644 --- a/cmake/configs/posix_ocpoc_cross.cmake +++ b/cmake/configs/posix_ocpoc_cross.cmake @@ -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 diff --git a/cmake/configs/posix_ocpoc_ubuntu.cmake b/cmake/configs/posix_ocpoc_ubuntu.cmake index a148295752..3faf5e85db 100644 --- a/cmake/configs/posix_ocpoc_ubuntu.cmake +++ b/cmake/configs/posix_ocpoc_ubuntu.cmake @@ -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 diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index 54023e3cb8..ac9240c5d2 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/cmake/configs/posix_rpi_common.cmake @@ -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 diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake index e0122ec3cb..65ea053915 100644 --- a/cmake/configs/posix_sitl_default.cmake +++ b/cmake/configs/posix_sitl_default.cmake @@ -122,7 +122,6 @@ set(config_module_list lib/ecl lib/geo lib/geo_lookup - lib/launchdetection lib/led lib/mixer lib/mathlib diff --git a/src/modules/fw_pos_control_l1/CMakeLists.txt b/src/modules/fw_pos_control_l1/CMakeLists.txt index 20b6fadbe6..c2c4169e1a 100644 --- a/src/modules/fw_pos_control_l1/CMakeLists.txt +++ b/src/modules/fw_pos_control_l1/CMakeLists.txt @@ -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 : diff --git a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp index 6b5bfd0bd6..74101124fe 100644 --- a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp +++ b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp @@ -56,12 +56,12 @@ #include #include "Landingslope.hpp" +#include "launchdetection/LaunchDetector.h" #include #include #include #include -#include #include #include #include diff --git a/src/lib/launchdetection/CMakeLists.txt b/src/modules/fw_pos_control_l1/launchdetection/CMakeLists.txt similarity index 89% rename from src/lib/launchdetection/CMakeLists.txt rename to src/modules/fw_pos_control_l1/launchdetection/CMakeLists.txt index 8768485c20..d7be8b54b2 100644 --- a/src/lib/launchdetection/CMakeLists.txt +++ b/src/modules/fw_pos_control_l1/launchdetection/CMakeLists.txt @@ -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 +) \ No newline at end of file diff --git a/src/lib/launchdetection/CatapultLaunchMethod.cpp b/src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.cpp similarity index 100% rename from src/lib/launchdetection/CatapultLaunchMethod.cpp rename to src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.cpp diff --git a/src/lib/launchdetection/CatapultLaunchMethod.h b/src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.h similarity index 100% rename from src/lib/launchdetection/CatapultLaunchMethod.h rename to src/modules/fw_pos_control_l1/launchdetection/CatapultLaunchMethod.h diff --git a/src/lib/launchdetection/LaunchDetector.cpp b/src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.cpp similarity index 100% rename from src/lib/launchdetection/LaunchDetector.cpp rename to src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.cpp diff --git a/src/lib/launchdetection/LaunchDetector.h b/src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.h similarity index 100% rename from src/lib/launchdetection/LaunchDetector.h rename to src/modules/fw_pos_control_l1/launchdetection/LaunchDetector.h diff --git a/src/lib/launchdetection/LaunchMethod.h b/src/modules/fw_pos_control_l1/launchdetection/LaunchMethod.h similarity index 100% rename from src/lib/launchdetection/LaunchMethod.h rename to src/modules/fw_pos_control_l1/launchdetection/LaunchMethod.h diff --git a/src/lib/launchdetection/launchdetection_params.c b/src/modules/fw_pos_control_l1/launchdetection/launchdetection_params.c similarity index 100% rename from src/lib/launchdetection/launchdetection_params.c rename to src/modules/fw_pos_control_l1/launchdetection/launchdetection_params.c