From b3b1161d53e82e6bbb7c9a22028964048ca50241 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 1 Feb 2018 23:12:46 -0500 Subject: [PATCH] mathlib filters include automatically --- cmake/configs/nuttx_aerocore2_default.cmake | 1 - 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 - .../nuttx_px4-same70xplained-v1_default.cmake | 1 - .../nuttx_px4-stm32f4discovery_default.cmake | 1 - cmake/configs/nuttx_px4fmu-v2_default.cmake | 1 - cmake/configs/nuttx_px4fmu-v2_test.cmake | 1 - cmake/configs/nuttx_px4fmu-v3_default.cmake | 1 - cmake/configs/nuttx_px4fmu-v4_default.cmake | 1 - .../configs/nuttx_px4fmu-v4pro_default.cmake | 1 - cmake/configs/nuttx_px4fmu-v5_default.cmake | 1 - .../nuttx_px4nucleoF767ZI-v1_default.cmake | 1 - cmake/configs/nuttx_tap-v1_default.cmake | 1 - cmake/configs/posix_bebop_default.cmake | 1 - cmake/configs/posix_eagle_hil.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/posix_sitl_default.cmake | 1 - cmake/configs/posix_sitl_replay.cmake | 1 - cmake/configs/qurt_eagle_hil.cmake | 1 - cmake/configs/qurt_eagle_muorb.cmake | 1 - cmake/configs/qurt_eagle_test.cmake | 1 - cmake/configs/qurt_eagle_travis.cmake | 1 - cmake/configs/qurt_sdflight_default.cmake | 1 - cmake/configs/qurt_sdflight_legacy.cmake | 1 - src/lib/mathlib/CMakeLists.txt | 4 +- src/lib/mathlib/math/filter/CMakeLists.txt | 40 ------------------- 33 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 src/lib/mathlib/math/filter/CMakeLists.txt diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index eb8082717a..953667a45e 100644 --- a/cmake/configs/nuttx_aerocore2_default.cmake +++ b/cmake/configs/nuttx_aerocore2_default.cmake @@ -117,7 +117,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_aerofc-v1_default.cmake b/cmake/configs/nuttx_aerofc-v1_default.cmake index 47cb05b4b6..434975e07e 100644 --- a/cmake/configs/nuttx_aerofc-v1_default.cmake +++ b/cmake/configs/nuttx_aerofc-v1_default.cmake @@ -82,7 +82,6 @@ set(config_module_list lib/geo lib/geo_lookup lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake index 7002641bf3..dbd1cf315e 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/cmake/configs/nuttx_auav-x21_default.cmake @@ -129,7 +129,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake index 80d82dd580..2eff33e186 100644 --- a/cmake/configs/nuttx_crazyflie_default.cmake +++ b/cmake/configs/nuttx_crazyflie_default.cmake @@ -85,7 +85,6 @@ set(config_module_list lib/geo lib/geo_lookup lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index 9f4ad315c2..89896767d3 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -132,7 +132,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake index 00c4a3b36f..c6d6020ecc 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake @@ -139,7 +139,6 @@ set(config_module_list lib/conversion lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake index 2a70f42ac6..683e6b6695 100644 --- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake +++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake @@ -111,7 +111,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake b/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake index 1585d3338a..e7439dcccd 100644 --- a/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake +++ b/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake @@ -40,7 +40,6 @@ set(config_module_list lib/ecl lib/geo lib/mathlib - lib/mathlib/math/filter lib/mixer lib/version diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index 99ba6ec0b1..073fa3fd5a 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -145,7 +145,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery #lib/terrain_estimation diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake index 8e8dd9222f..e4da5334e7 100644 --- a/cmake/configs/nuttx_px4fmu-v2_test.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake @@ -130,7 +130,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake index fc448ccbe3..9f7d84fbf3 100644 --- a/cmake/configs/nuttx_px4fmu-v3_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake @@ -146,7 +146,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake index ed52ed109d..8479d505b6 100644 --- a/cmake/configs/nuttx_px4fmu-v4_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake @@ -138,7 +138,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake index 5b4a183d48..6ea68a1981 100644 --- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake @@ -138,7 +138,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake index 3b0c28f6cc..106c3f3f5f 100644 --- a/cmake/configs/nuttx_px4fmu-v5_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake @@ -139,7 +139,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake index f66846568c..629a2309ff 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake @@ -117,7 +117,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_tap-v1_default.cmake b/cmake/configs/nuttx_tap-v1_default.cmake index 3511f5eb9a..27835b683b 100644 --- a/cmake/configs/nuttx_tap-v1_default.cmake +++ b/cmake/configs/nuttx_tap-v1_default.cmake @@ -93,7 +93,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake index f910ffe80e..1decaa0095 100644 --- a/cmake/configs/posix_bebop_default.cmake +++ b/cmake/configs/posix_bebop_default.cmake @@ -78,7 +78,6 @@ set(config_module_list lib/geo lib/geo_lookup lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/posix_eagle_hil.cmake b/cmake/configs/posix_eagle_hil.cmake index 0efec4f183..bb26284e36 100644 --- a/cmake/configs/posix_eagle_hil.cmake +++ b/cmake/configs/posix_eagle_hil.cmake @@ -40,7 +40,6 @@ set(config_module_list lib/controllib lib/mathlib - lib/mathlib/math/filter lib/ecl lib/geo lib/geo_lookup diff --git a/cmake/configs/posix_ocpoc_cross.cmake b/cmake/configs/posix_ocpoc_cross.cmake index 4f0b7966f9..81a38b7804 100644 --- a/cmake/configs/posix_ocpoc_cross.cmake +++ b/cmake/configs/posix_ocpoc_cross.cmake @@ -87,7 +87,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/posix_ocpoc_ubuntu.cmake b/cmake/configs/posix_ocpoc_ubuntu.cmake index 5ebde17720..1ab2904d23 100644 --- a/cmake/configs/posix_ocpoc_ubuntu.cmake +++ b/cmake/configs/posix_ocpoc_ubuntu.cmake @@ -86,7 +86,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index 3a95eb3f04..c34b741944 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/cmake/configs/posix_rpi_common.cmake @@ -99,7 +99,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/posix_sdflight_default.cmake b/cmake/configs/posix_sdflight_default.cmake index 1e7394015b..784b5119b3 100644 --- a/cmake/configs/posix_sdflight_default.cmake +++ b/cmake/configs/posix_sdflight_default.cmake @@ -76,7 +76,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/posix_sdflight_legacy.cmake b/cmake/configs/posix_sdflight_legacy.cmake index 316cbde37c..442b5c8eb4 100644 --- a/cmake/configs/posix_sdflight_legacy.cmake +++ b/cmake/configs/posix_sdflight_legacy.cmake @@ -68,7 +68,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake index 48dd52b514..1fe4f5e0dc 100644 --- a/cmake/configs/posix_sitl_default.cmake +++ b/cmake/configs/posix_sitl_default.cmake @@ -125,7 +125,6 @@ set(config_module_list lib/led lib/mixer lib/mathlib - lib/mathlib/math/filter lib/rc lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/posix_sitl_replay.cmake b/cmake/configs/posix_sitl_replay.cmake index 275dccb33e..388451d61d 100644 --- a/cmake/configs/posix_sitl_replay.cmake +++ b/cmake/configs/posix_sitl_replay.cmake @@ -16,7 +16,6 @@ set(config_module_list modules/logger lib/controllib lib/mathlib - lib/mathlib/math/filter lib/conversion lib/ecl lib/geo diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake index d701a5687b..adb6f97ae7 100644 --- a/cmake/configs/qurt_eagle_hil.cmake +++ b/cmake/configs/qurt_eagle_hil.cmake @@ -66,7 +66,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/qurt_eagle_muorb.cmake b/cmake/configs/qurt_eagle_muorb.cmake index 059c7e545f..9ec8bd9e4d 100644 --- a/cmake/configs/qurt_eagle_muorb.cmake +++ b/cmake/configs/qurt_eagle_muorb.cmake @@ -38,7 +38,6 @@ set(config_module_list # Libraries # lib/mathlib - lib/mathlib/math/filter lib/geo lib/geo_lookup lib/conversion diff --git a/cmake/configs/qurt_eagle_test.cmake b/cmake/configs/qurt_eagle_test.cmake index 9757bec3f3..592aefb900 100644 --- a/cmake/configs/qurt_eagle_test.cmake +++ b/cmake/configs/qurt_eagle_test.cmake @@ -40,7 +40,6 @@ set(config_module_list lib/conversion lib/DriverFramework/framework lib/mathlib - lib/mathlib/math/filter lib/mixer ) diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index 91fe1b819c..ac7a3b7320 100644 --- a/cmake/configs/qurt_eagle_travis.cmake +++ b/cmake/configs/qurt_eagle_travis.cmake @@ -72,7 +72,6 @@ set(config_module_list lib/geo_lookup lib/led lib/mathlib - lib/mathlib/math/filter lib/mixer lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/qurt_sdflight_default.cmake b/cmake/configs/qurt_sdflight_default.cmake index 3c5a079bd3..27edcf1b20 100644 --- a/cmake/configs/qurt_sdflight_default.cmake +++ b/cmake/configs/qurt_sdflight_default.cmake @@ -89,7 +89,6 @@ set(config_module_list lib/geo lib/geo_lookup lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/cmake/configs/qurt_sdflight_legacy.cmake b/cmake/configs/qurt_sdflight_legacy.cmake index 0c091bebe5..da1eff8c44 100644 --- a/cmake/configs/qurt_sdflight_legacy.cmake +++ b/cmake/configs/qurt_sdflight_legacy.cmake @@ -88,7 +88,6 @@ set(config_module_list lib/geo lib/geo_lookup lib/mathlib - lib/mathlib/math/filter lib/mixer lib/rc lib/tailsitter_recovery diff --git a/src/lib/mathlib/CMakeLists.txt b/src/lib/mathlib/CMakeLists.txt index d966294457..3c0b007f7a 100644 --- a/src/lib/mathlib/CMakeLists.txt +++ b/src/lib/mathlib/CMakeLists.txt @@ -37,7 +37,5 @@ px4_add_module( math/test/test.cpp math/Limits.cpp math/matrix_alg.cpp - DEPENDS - platforms__common + math/filter/LowPassFilter2p.cpp ) -# vim: set noet ft=cmake fenc=utf-8 ff=unix : diff --git a/src/lib/mathlib/math/filter/CMakeLists.txt b/src/lib/mathlib/math/filter/CMakeLists.txt deleted file mode 100644 index 785b2f2c6c..0000000000 --- a/src/lib/mathlib/math/filter/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -# -# Copyright (c) 2015 PX4 Development Team. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ -px4_add_module( - MODULE lib__mathlib__math__filter - SRCS - LowPassFilter2p.cpp - DEPENDS - platforms__common - ) -# vim: set noet ft=cmake fenc=utf-8 ff=unix :