From 22acb1dab1483fcbf618a8836864750ff8596b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Sat, 3 Mar 2018 20:31:20 +0100 Subject: [PATCH] cmake configs: add landing_target_estimator wherever local_position_estimator is enabled LTEST_MODE is defined in landing_target_estimator and required by local_position_estimator. --- cmake/configs/nuttx_aerofc-v1_default.cmake | 1 + cmake/configs/nuttx_auav-x21_default.cmake | 1 + cmake/configs/nuttx_crazyflie_default.cmake | 1 + cmake/configs/nuttx_mindpx-v2_default.cmake | 1 + cmake/configs/nuttx_nxphlite-v3_default.cmake | 1 + cmake/configs/nuttx_px4-same70xplained-v1_default.cmake | 1 + cmake/configs/nuttx_px4fmu-v2_default.cmake | 2 +- cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake | 1 + cmake/configs/posix_bebop_default.cmake | 1 + cmake/configs/posix_ocpoc_cross.cmake | 1 + cmake/configs/posix_ocpoc_ubuntu.cmake | 1 + cmake/configs/posix_rpi_common.cmake | 1 + cmake/configs/posix_sdflight_default.cmake | 1 + cmake/configs/posix_sdflight_legacy.cmake | 1 + cmake/configs/qurt_eagle_hil.cmake | 1 + cmake/configs/qurt_eagle_travis.cmake | 1 + cmake/configs/qurt_sdflight_default.cmake | 1 + cmake/configs/qurt_sdflight_legacy.cmake | 1 + 18 files changed, 18 insertions(+), 1 deletion(-) diff --git a/cmake/configs/nuttx_aerofc-v1_default.cmake b/cmake/configs/nuttx_aerofc-v1_default.cmake index 44661cd2c8..0facb2edb2 100644 --- a/cmake/configs/nuttx_aerofc-v1_default.cmake +++ b/cmake/configs/nuttx_aerofc-v1_default.cmake @@ -51,6 +51,7 @@ set(config_module_list # modules/attitude_estimator_q modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake index 61ba8dc12d..58f779ccd8 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/cmake/configs/nuttx_auav-x21_default.cmake @@ -90,6 +90,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake index 81ba1c75c2..7426b69f03 100644 --- a/cmake/configs/nuttx_crazyflie_default.cmake +++ b/cmake/configs/nuttx_crazyflie_default.cmake @@ -50,6 +50,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index 638817bfb8..bae0a4d4d3 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -94,6 +94,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake index daa6e180a7..ef6193f3d0 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake @@ -98,6 +98,7 @@ set(config_module_list modules/attitude_estimator_q modules/ekf2 modules/local_position_estimator + modules/landing_target_estimator modules/position_estimator_inav # diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake index 9e3366adf6..edc51b2d85 100644 --- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake +++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake @@ -72,6 +72,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index 0738d98199..a4f0e4702a 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -38,7 +38,7 @@ set(config_module_list #drivers/oreoled #drivers/protocol_splitter drivers/pwm_input - drivers/pwm_out_sim + #drivers/pwm_out_sim drivers/px4flow drivers/px4fmu drivers/px4io diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake index 3f2bc88bf0..3a2256e6f4 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake @@ -78,6 +78,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake index 1e62c8f075..07601f2c99 100644 --- a/cmake/configs/posix_bebop_default.cmake +++ b/cmake/configs/posix_bebop_default.cmake @@ -38,6 +38,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/posix_ocpoc_cross.cmake b/cmake/configs/posix_ocpoc_cross.cmake index 6c18c50e65..fb7d0b3a99 100644 --- a/cmake/configs/posix_ocpoc_cross.cmake +++ b/cmake/configs/posix_ocpoc_cross.cmake @@ -41,6 +41,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/posix_ocpoc_ubuntu.cmake b/cmake/configs/posix_ocpoc_ubuntu.cmake index c6f809f108..8a8f3870dd 100644 --- a/cmake/configs/posix_ocpoc_ubuntu.cmake +++ b/cmake/configs/posix_ocpoc_ubuntu.cmake @@ -41,6 +41,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index 4c95d015b0..dff2fb5f4a 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/cmake/configs/posix_rpi_common.cmake @@ -51,6 +51,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/posix_sdflight_default.cmake b/cmake/configs/posix_sdflight_default.cmake index 96bfeff8a0..dcb0a3beda 100644 --- a/cmake/configs/posix_sdflight_default.cmake +++ b/cmake/configs/posix_sdflight_default.cmake @@ -51,6 +51,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 modules/mc_pos_control diff --git a/cmake/configs/posix_sdflight_legacy.cmake b/cmake/configs/posix_sdflight_legacy.cmake index b81941064b..01aaa77fdb 100644 --- a/cmake/configs/posix_sdflight_legacy.cmake +++ b/cmake/configs/posix_sdflight_legacy.cmake @@ -43,6 +43,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 modules/mc_pos_control diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake index b853f25992..a43ed38cee 100644 --- a/cmake/configs/qurt_eagle_hil.cmake +++ b/cmake/configs/qurt_eagle_hil.cmake @@ -40,6 +40,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index 20fc8fefde..5fb5bdc81d 100644 --- a/cmake/configs/qurt_eagle_travis.cmake +++ b/cmake/configs/qurt_eagle_travis.cmake @@ -45,6 +45,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/qurt_sdflight_default.cmake b/cmake/configs/qurt_sdflight_default.cmake index 509c00dd1a..c7586f8fcb 100644 --- a/cmake/configs/qurt_sdflight_default.cmake +++ b/cmake/configs/qurt_sdflight_default.cmake @@ -54,6 +54,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 # diff --git a/cmake/configs/qurt_sdflight_legacy.cmake b/cmake/configs/qurt_sdflight_legacy.cmake index d338b8bffd..9de21a4c7e 100644 --- a/cmake/configs/qurt_sdflight_legacy.cmake +++ b/cmake/configs/qurt_sdflight_legacy.cmake @@ -49,6 +49,7 @@ set(config_module_list modules/attitude_estimator_q modules/position_estimator_inav modules/local_position_estimator + modules/landing_target_estimator modules/ekf2 #