diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index 08603c73fde..eb8082717ab 100644 --- a/cmake/configs/nuttx_aerocore2_default.cmake +++ b/cmake/configs/nuttx_aerocore2_default.cmake @@ -120,7 +120,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake index 58eada4c6b3..7002641bf3e 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/cmake/configs/nuttx_auav-x21_default.cmake @@ -131,7 +131,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake index 8b114584a15..80d82dd5809 100644 --- a/cmake/configs/nuttx_crazyflie_default.cmake +++ b/cmake/configs/nuttx_crazyflie_default.cmake @@ -88,7 +88,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index 9137019c9ce..9f4ad315c2a 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -135,7 +135,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake index dc05fa3f1e2..00c4a3b36ff 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake @@ -142,7 +142,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake index f161c41f022..2a70f42ac69 100644 --- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake +++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake @@ -114,7 +114,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index 978efe6a3cb..99ba6ec0b18 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -147,7 +147,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery #lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake index be7ef479f39..8e8dd9222f9 100644 --- a/cmake/configs/nuttx_px4fmu-v2_test.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake @@ -132,7 +132,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake index 123e7b3c6f5..fc448ccbe30 100644 --- a/cmake/configs/nuttx_px4fmu-v3_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake @@ -148,7 +148,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake index 81558300a52..ed52ed109dc 100644 --- a/cmake/configs/nuttx_px4fmu-v4_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake @@ -141,7 +141,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake index 57e7bc96799..5b4a183d48e 100644 --- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake @@ -140,7 +140,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake index be1537f9dfa..3b0c28f6cc9 100644 --- a/cmake/configs/nuttx_px4fmu-v5_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake @@ -142,7 +142,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake index 8e2743480b4..f66846568c2 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake @@ -120,7 +120,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/nuttx_tap-v1_default.cmake b/cmake/configs/nuttx_tap-v1_default.cmake index 8666d133158..3511f5eb9a2 100644 --- a/cmake/configs/nuttx_tap-v1_default.cmake +++ b/cmake/configs/nuttx_tap-v1_default.cmake @@ -96,7 +96,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake index 0dee4861e2f..f910ffe80e7 100644 --- a/cmake/configs/posix_bebop_default.cmake +++ b/cmake/configs/posix_bebop_default.cmake @@ -80,7 +80,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/posix_ocpoc_cross.cmake b/cmake/configs/posix_ocpoc_cross.cmake index dcf29788b0d..4f0b7966f9d 100644 --- a/cmake/configs/posix_ocpoc_cross.cmake +++ b/cmake/configs/posix_ocpoc_cross.cmake @@ -90,7 +90,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/posix_ocpoc_ubuntu.cmake b/cmake/configs/posix_ocpoc_ubuntu.cmake index 3faf5e85db3..5ebde17720a 100644 --- a/cmake/configs/posix_ocpoc_ubuntu.cmake +++ b/cmake/configs/posix_ocpoc_ubuntu.cmake @@ -89,7 +89,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index ac9240c5d22..3a95eb3f044 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/cmake/configs/posix_rpi_common.cmake @@ -101,7 +101,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/posix_sdflight_default.cmake b/cmake/configs/posix_sdflight_default.cmake index 657f7eea36e..1e7394015b5 100644 --- a/cmake/configs/posix_sdflight_default.cmake +++ b/cmake/configs/posix_sdflight_default.cmake @@ -78,7 +78,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/posix_sdflight_legacy.cmake b/cmake/configs/posix_sdflight_legacy.cmake index f2c9ff3474e..316cbde37cd 100644 --- a/cmake/configs/posix_sdflight_legacy.cmake +++ b/cmake/configs/posix_sdflight_legacy.cmake @@ -70,7 +70,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake index 65ea0539158..48dd52b514b 100644 --- a/cmake/configs/posix_sitl_default.cmake +++ b/cmake/configs/posix_sitl_default.cmake @@ -127,7 +127,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/tunes diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake index 0000d44997e..d701a5687b8 100644 --- a/cmake/configs/qurt_eagle_hil.cmake +++ b/cmake/configs/qurt_eagle_hil.cmake @@ -68,7 +68,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index 987d7a6f290..91fe1b819c7 100644 --- a/cmake/configs/qurt_eagle_travis.cmake +++ b/cmake/configs/qurt_eagle_travis.cmake @@ -74,7 +74,6 @@ set(config_module_list lib/mathlib lib/mathlib/math/filter lib/mixer - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/qurt_sdflight_default.cmake b/cmake/configs/qurt_sdflight_default.cmake index 9d004b21d13..3c5a079bd37 100644 --- a/cmake/configs/qurt_sdflight_default.cmake +++ b/cmake/configs/qurt_sdflight_default.cmake @@ -92,7 +92,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/cmake/configs/qurt_sdflight_legacy.cmake b/cmake/configs/qurt_sdflight_legacy.cmake index c2229947fae..0c091bebe50 100644 --- a/cmake/configs/qurt_sdflight_legacy.cmake +++ b/cmake/configs/qurt_sdflight_legacy.cmake @@ -91,7 +91,6 @@ set(config_module_list lib/mathlib/math/filter lib/mixer lib/rc - lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version diff --git a/src/modules/fw_pos_control_l1/CMakeLists.txt b/src/modules/fw_pos_control_l1/CMakeLists.txt index c2c4169e1a1..225e402f389 100644 --- a/src/modules/fw_pos_control_l1/CMakeLists.txt +++ b/src/modules/fw_pos_control_l1/CMakeLists.txt @@ -32,6 +32,7 @@ ############################################################################ add_subdirectory(launchdetection) +add_subdirectory(runway_takeoff) px4_add_module( MODULE modules__fw_pos_control_l1 @@ -45,4 +46,5 @@ px4_add_module( git_ecl lib__ecl launchdetection + runway_takeoff ) diff --git a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp index 74101124fed..f2691ff9f36 100644 --- a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp +++ b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp @@ -57,13 +57,13 @@ #include "Landingslope.hpp" #include "launchdetection/LaunchDetector.h" +#include "runway_takeoff/RunwayTakeoff.h" #include #include #include #include #include -#include #include #include #include diff --git a/src/lib/runway_takeoff/CMakeLists.txt b/src/modules/fw_pos_control_l1/runway_takeoff/CMakeLists.txt similarity index 91% rename from src/lib/runway_takeoff/CMakeLists.txt rename to src/modules/fw_pos_control_l1/runway_takeoff/CMakeLists.txt index 019613fef20..8217b10f0f9 100644 --- a/src/lib/runway_takeoff/CMakeLists.txt +++ b/src/modules/fw_pos_control_l1/runway_takeoff/CMakeLists.txt @@ -30,12 +30,7 @@ # POSSIBILITY OF SUCH DAMAGE. # ############################################################################ -px4_add_module( - MODULE lib__runway_takeoff - COMPILE_FLAGS - SRCS - RunwayTakeoff.cpp - DEPENDS - platforms__common - ) -# vim: set noet ft=cmake fenc=utf-8 ff=unix : + +px4_add_library(runway_takeoff + RunwayTakeoff.cpp +) \ No newline at end of file diff --git a/src/lib/runway_takeoff/RunwayTakeoff.cpp b/src/modules/fw_pos_control_l1/runway_takeoff/RunwayTakeoff.cpp similarity index 100% rename from src/lib/runway_takeoff/RunwayTakeoff.cpp rename to src/modules/fw_pos_control_l1/runway_takeoff/RunwayTakeoff.cpp diff --git a/src/lib/runway_takeoff/RunwayTakeoff.h b/src/modules/fw_pos_control_l1/runway_takeoff/RunwayTakeoff.h similarity index 100% rename from src/lib/runway_takeoff/RunwayTakeoff.h rename to src/modules/fw_pos_control_l1/runway_takeoff/RunwayTakeoff.h diff --git a/src/lib/runway_takeoff/runway_takeoff_params.c b/src/modules/fw_pos_control_l1/runway_takeoff/runway_takeoff_params.c similarity index 100% rename from src/lib/runway_takeoff/runway_takeoff_params.c rename to src/modules/fw_pos_control_l1/runway_takeoff/runway_takeoff_params.c