diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index 08603c73fded5143d1db8b5e5c29c16a88f0b7c4..eb8082717aba6efd2e02e92a9d60b189e37afc5e 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 58eada4c6b3bf54c31bb1ff390eb3f95398c286c..7002641bf3e3c44acbc11346ef12a0daa110d3fb 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 8b114584a15253caaca843a8b5f653d7b16fc285..80d82dd58095646578aaedbb8cf7ee6a3920dbe9 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 9137019c9ce859a7c2dde8e899f8fdc4789a5a5a..9f4ad315c2a715b02dce67505419732c8d7d2315 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 dc05fa3f1e2e855d48be45ca3a73591d55be6ad9..00c4a3b36ff58f4abedb5bd3a32b31e2f672ad59 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 f161c41f022e6b16fc04b0c1d41304bc934d8ff0..2a70f42ac69249fca370a3351c407844e4a28cc7 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 978efe6a3cb128fb65d328204165afca4cfce705..99ba6ec0b18428f9a7f89524f5b24c9fa621a4b8 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 be7ef479f39cadec1c01fdec1feb23301e2871ec..8e8dd9222f9414983f663660ea515e17e7f1aecf 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 123e7b3c6f5ebe2ebba9d917c1952c53b68a751e..fc448ccbe3056835f40b9ad13a388ec6f4ff4d89 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 81558300a5286a76d71661f17fad04a09ddd7e47..ed52ed109dcb86dcce2ee2d5391eff7939a61064 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 57e7bc96799e973527856d78983fb9f1ecdbedd1..5b4a183d48e78b51cc29262e5ec1abd16ee7251f 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 be1537f9dfa654f45848f261f06f1ce19166598a..3b0c28f6cc9d545ebf714d0b1825e7e43327867e 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 8e2743480b496c88b3f1b7efd6375442392220e7..f66846568c28b5bfb14d3381e8e00c84803e85a6 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 8666d133158f7e6a75225d64bf12c62015d0027e..3511f5eb9a27666674af70f1ee5a5bdcb2222ea6 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 0dee4861e2f9b385c9cad4169d12074f003fe364..f910ffe80e7283c026068cbdfa12d2ccccfbdf3f 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 dcf29788b0d762bb9b2dd06a0f321a0f92233f75..4f0b7966f9ddb4014b76f3068f4ef5e4ffb845f2 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 3faf5e85db32ff4ef7c39076dc06fa433f2adb17..5ebde17720aa95a440322267dad3e8ca1bffd524 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 ac9240c5d2296c14c9a2c941a62defc19ac7de6a..3a95eb3f0443901b6325af5440e90248c55772c9 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 657f7eea36e770590312a03fb4b6751051e102af..1e7394015b5001e3266d3956810c570bf05d9055 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 f2c9ff3474eb90a19b87d572189a48a17ec14345..316cbde37cddb68fb8fd0f2104fd6dd97313a2dc 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 65ea0539158cacb1345d94be1c80ac5b919b777c..48dd52b514b73680594e54a616f22964feac3f35 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 0000d44997e2ab86c992fee4d210632dd3da4ada..d701a5687b89204b3138230d703cd670759f947e 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 987d7a6f29025870f120335d2b167e7e97e76d72..91fe1b819c7b4b958257f59d19845092a85636c1 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 9d004b21d139e63cabb91c9a81e6bb75bfd31b95..3c5a079bd375cc4fb10adefadd319add51258b34 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 c2229947fae3d4e728ba2110e8ff1b3c9fa66057..0c091bebe50114ad0311255edca8ecd4fea8437b 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 c2c4169e1a1361d49a7db2481d2059907f850454..225e402f3893497efa2c892f2e566674d6b4d30f 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 74101124fed0799de27d179b565c7c37a85da803..f2691ff9f3617adf52f51b9e4316b4cdf5fbd3ea 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 <drivers/drv_hrt.h> #include <ecl/l1/ecl_l1_pos_controller.h> #include <ecl/tecs/tecs.h> #include <geo/geo.h> #include <mathlib/mathlib.h> -#include <runway_takeoff/RunwayTakeoff.h> #include <systemlib/perf_counter.h> #include <uORB/Subscription.hpp> #include <uORB/topics/airspeed.h> 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 019613fef20687dd1e9b5c2bb9757b77e7d4d4bf..8217b10f0f90c43439d09b0f4a8f54a93d9da353 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