move tailsitter_recovery lib to mc_att_control

2026-05-22 01:12:31 +00:00 · 2018-02-01 23:16:06 -05:00
parent b3b1161d53
commit f5c1124812
31 changed files with 10 additions and 39 deletions
--- a/cmake/configs/nuttx_aerocore2_default.cmake
+++ b/cmake/configs/nuttx_aerocore2_default.cmake
@@ -119,7 +119,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_aerofc-v1_default.cmake
+++ b/cmake/configs/nuttx_aerofc-v1_default.cmake
@@ -84,6 +84,5 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/version
 )
--- a/cmake/configs/nuttx_auav-x21_default.cmake
+++ b/cmake/configs/nuttx_auav-x21_default.cmake
@@ -130,7 +130,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_crazyflie_default.cmake
+++ b/cmake/configs/nuttx_crazyflie_default.cmake
@@ -87,7 +87,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version

--- a/cmake/configs/nuttx_mindpx-v2_default.cmake
+++ b/cmake/configs/nuttx_mindpx-v2_default.cmake
@@ -134,7 +134,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_nxphlite-v3_default.cmake
+++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake
@@ -141,7 +141,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake
+++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake
@@ -113,7 +113,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version

--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -146,7 +146,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	#lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_px4fmu-v2_test.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake
@@ -131,7 +131,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_px4fmu-v3_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake
@@ -147,7 +147,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@@ -140,7 +140,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
@@ -139,7 +139,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_px4fmu-v5_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake
@@ -141,7 +141,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
+++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
@@ -119,7 +119,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/nuttx_tap-v1_default.cmake
+++ b/cmake/configs/nuttx_tap-v1_default.cmake
@@ -95,7 +95,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/posix_bebop_default.cmake
+++ b/cmake/configs/posix_bebop_default.cmake
@@ -79,7 +79,6 @@ set(config_module_list
 	lib/geo_lookup
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version
 )
--- a/cmake/configs/posix_ocpoc_cross.cmake
+++ b/cmake/configs/posix_ocpoc_cross.cmake
@@ -89,7 +89,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version
 	
--- a/cmake/configs/posix_ocpoc_ubuntu.cmake
+++ b/cmake/configs/posix_ocpoc_ubuntu.cmake
@@ -88,7 +88,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version
 	
--- a/cmake/configs/posix_rpi_common.cmake
+++ b/cmake/configs/posix_rpi_common.cmake
@@ -100,7 +100,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/posix_sdflight_default.cmake
+++ b/cmake/configs/posix_sdflight_default.cmake
@@ -77,7 +77,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/posix_sdflight_legacy.cmake
+++ b/cmake/configs/posix_sdflight_legacy.cmake
@@ -69,7 +69,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/posix_sitl_default.cmake
+++ b/cmake/configs/posix_sitl_default.cmake
@@ -126,7 +126,6 @@ set(config_module_list
 	lib/mixer
 	lib/mathlib
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/tunes
 	lib/version
--- a/cmake/configs/qurt_eagle_hil.cmake
+++ b/cmake/configs/qurt_eagle_hil.cmake
@@ -67,7 +67,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version

--- a/cmake/configs/qurt_eagle_travis.cmake
+++ b/cmake/configs/qurt_eagle_travis.cmake
@@ -73,7 +73,6 @@ set(config_module_list
 	lib/led
 	lib/mathlib
 	lib/mixer
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version

--- a/cmake/configs/qurt_sdflight_default.cmake
+++ b/cmake/configs/qurt_sdflight_default.cmake
@@ -91,7 +91,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version

--- a/cmake/configs/qurt_sdflight_legacy.cmake
+++ b/cmake/configs/qurt_sdflight_legacy.cmake
@@ -90,7 +90,6 @@ set(config_module_list
 	lib/mathlib
 	lib/mixer
 	lib/rc
-	lib/tailsitter_recovery
 	lib/terrain_estimation
 	lib/version

--- a/src/modules/mc_att_control/CMakeLists.txt
+++ b/src/modules/mc_att_control/CMakeLists.txt
@@ -30,6 +30,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
+
+add_subdirectory(tailsitter_recovery)
+
 px4_add_module(
 	MODULE modules__mc_att_control
 	MAIN mc_att_control
@@ -39,6 +42,5 @@ px4_add_module(
 	SRCS
 		mc_att_control_main.cpp
 	DEPENDS
-		platforms__common
+		tailsitter_recovery
 	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
--- a/src/modules/mc_att_control/mc_att_control_main.cpp
+++ b/src/modules/mc_att_control/mc_att_control_main.cpp
@@ -53,12 +53,13 @@
 * If rotation matrix setpoint is invalid it will be generated from Euler angles for compatibility with old position controllers.
 */

+#include "tailsitter_recovery/tailsitter_recovery.h"
+
 #include <conversion/rotation.h>
 #include <drivers/drv_hrt.h>
 #include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/mixer/mixer.h>
-#include <lib/tailsitter_recovery/tailsitter_recovery.h>
 #include <px4_config.h>
 #include <px4_defines.h>
 #include <px4_posix.h>
--- a/src/modules/mc_att_control/tailsitter_recovery/CMakeLists.txt
+++ b/src/modules/mc_att_control/tailsitter_recovery/CMakeLists.txt
@@ -30,13 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE lib__tailsitter_recovery
-	STACK_MAIN 400
-	COMPILE_FLAGS
-	SRCS
-		tailsitter_recovery.cpp
-	DEPENDS
-		platforms__common
-	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+
+px4_add_library(tailsitter_recovery
+	tailsitter_recovery.cpp
+)
--- a/src/modules/mc_att_control/tailsitter_recovery/tailsitter_recovery.cpp
+++ b/src/modules/mc_att_control/tailsitter_recovery/tailsitter_recovery.cpp
--- a/src/modules/mc_att_control/tailsitter_recovery/tailsitter_recovery.h
+++ b/src/modules/mc_att_control/tailsitter_recovery/tailsitter_recovery.h