From 58135d892ba00e0ffe87e9ced00356a950e7e445 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Sat, 6 Aug 2016 20:36:38 +0200
Subject: [PATCH] Sync estimator CMake configs for all boards
---
cmake/configs/nuttx_mindpx-v2_default.cmake | 1 -
cmake/configs/nuttx_px4fmu-v1_default.cmake | 6 +-
cmake/configs/nuttx_px4fmu-v2_default.cmake | 3 +-
cmake/configs/nuttx_px4fmu-v2_ekf2.cmake | 195 ------------------
cmake/configs/nuttx_px4fmu-v2_test.cmake | 3 +-
cmake/configs/posix_bebop_default.cmake | 4 +-
.../posix_eagle_legacy_driver_default.cmake | 6 +-
cmake/configs/posix_rpi_common.cmake | 4 +-
cmake/configs/posix_sdflight_default.cmake | 6 +-
cmake/configs/posix_sitl_broadcast.cmake | 4 +-
cmake/configs/qurt_eagle_hil.cmake | 6 +-
.../qurt_eagle_legacy_driver_default.cmake | 4 +-
cmake/configs/qurt_eagle_travis.cmake | 6 +-
cmake/configs/qurt_sdflight_default.cmake | 5 +-
14 files changed, 26 insertions(+), 227 deletions(-)
delete mode 100644 cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake
index 41c9d32df8..d269cb39b3 100644
--- a/cmake/configs/nuttx_mindpx-v2_default.cmake
+++ b/cmake/configs/nuttx_mindpx-v2_default.cmake
@@ -101,7 +101,6 @@ set(config_module_list
# Estimation modules (EKF/ SO3 / other filters)
#
modules/attitude_estimator_q
- modules/ekf_att_pos_estimator
modules/position_estimator_inav
modules/local_position_estimator
modules/ekf2
diff --git a/cmake/configs/nuttx_px4fmu-v1_default.cmake b/cmake/configs/nuttx_px4fmu-v1_default.cmake
index 75f8d054ed..c53b199fdd 100644
--- a/cmake/configs/nuttx_px4fmu-v1_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v1_default.cmake
@@ -68,13 +68,11 @@ set(config_module_list
modules/land_detector
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
- # Too high RAM usage due to static allocations
- # modules/attitude_estimator_ekf
modules/attitude_estimator_q
- modules/ekf_att_pos_estimator
modules/position_estimator_inav
+ modules/local_position_estimator
modules/ekf2
#
diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake
index c38d726702..337d377370 100644
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -94,10 +94,9 @@ set(config_module_list
modules/land_detector
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
modules/attitude_estimator_q
- #modules/ekf_att_pos_estimator
modules/position_estimator_inav
modules/local_position_estimator
modules/ekf2
diff --git a/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake b/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
deleted file mode 100644
index f43b782045..0000000000
--- a/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
+++ /dev/null
@@ -1,195 +0,0 @@
-include(nuttx/px4_impl_nuttx)
-
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake)
-
-set(config_uavcan_num_ifaces 2)
-
-set(config_module_list
- #
- # Board support modules
- #
- drivers/device
- drivers/stm32
- drivers/stm32/adc
- drivers/stm32/tone_alarm
- drivers/led
- drivers/px4fmu
- drivers/px4io
- drivers/boards/px4fmu-v2
- drivers/rgbled
- drivers/mpu6000
- drivers/mpu9250
- drivers/lsm303d
- drivers/l3gd20
- drivers/hmc5883
- drivers/ms5611
- #drivers/mb12xx
- drivers/srf02
- drivers/sf0x
- drivers/ll40ls
- drivers/trone
- drivers/gps
- drivers/pwm_out_sim
- #drivers/hott
- #drivers/hott/hott_telemetry
- #drivers/hott/hott_sensors
- drivers/blinkm
- drivers/airspeed
- drivers/ets_airspeed
- drivers/meas_airspeed
- drivers/frsky_telemetry
- modules/sensors
- #drivers/mkblctrl
- drivers/px4flow
- #drivers/oreoled
- drivers/gimbal
- drivers/pwm_input
- drivers/camera_trigger
- drivers/bst
- #drivers/snapdragon_rc_pwm
- #drivers/lis3mdl
-
- #
- # System commands
- #
- systemcmds/bl_update
- systemcmds/mixer
- systemcmds/param
- systemcmds/perf
- systemcmds/pwm
- systemcmds/esc_calib
- systemcmds/reboot
- #systemcmds/topic_listener
- systemcmds/top
- systemcmds/config
- systemcmds/nshterm
- systemcmds/mtd
- systemcmds/dumpfile
- systemcmds/ver
- #systemcmds/sd_bench
- #systemcmds/tests
- systemcmds/motor_ramp
-
- #
- # General system control
- #
- modules/commander
- modules/load_mon
- modules/navigator
- modules/mavlink
- #modules/gpio_led
- modules/uavcan
- modules/land_detector
-
- #
- # Estimation modules (EKF/ SO3 / other filters)
- #
- modules/ekf2
-
- #
- # Vehicle Control
- #
- # modules/segway # XXX Needs GCC 4.7 fix
- modules/fw_pos_control_l1
- modules/fw_att_control
- modules/mc_att_control
- modules/mc_pos_control
- modules/vtol_att_control
-
- #
- # Logging
- #
- modules/logger
- modules/sdlog2
-
- #
- # Library modules
- #
- modules/param
- modules/systemlib
- modules/systemlib/mixer
- modules/uORB
- modules/dataman
-
- #
- # Libraries
- #
- lib/controllib
- lib/mathlib
- lib/mathlib/math/filter
- lib/ecl
- lib/external_lgpl
- lib/geo
- lib/geo_lookup
- lib/conversion
- lib/launchdetection
- lib/terrain_estimation
- lib/runway_takeoff
- lib/tailsitter_recovery
- lib/DriverFramework/framework
- platforms/nuttx
-
- # had to add for cmake, not sure why wasn't in original config
- platforms/common
- platforms/nuttx/px4_layer
-
- #
- # OBC challenge
- #
- #modules/bottle_drop
-
- #
- # Rover apps
- #
- #examples/rover_steering_control
-
- #
- # Demo apps
- #
- #examples/math_demo
- # Tutorial code from
- # https://px4.io/dev/px4_simple_app
- #examples/px4_simple_app
-
- # Tutorial code from
- # https://px4.io/dev/daemon
- #examples/px4_daemon_app
-
- # Tutorial code from
- # https://px4.io/dev/debug_values
- #examples/px4_mavlink_debug
-
- # Tutorial code from
- # https://px4.io/dev/example_fixedwing_control
- #examples/fixedwing_control
-
- # Hardware test
- #examples/hwtest
-)
-
-set(config_extra_builtin_cmds
- serdis
- sercon
- )
-
-set(config_io_board
- px4io-v2
- )
-
-set(config_extra_libs
- uavcan
- uavcan_stm32_driver
- )
-
-set(config_io_extra_libs
- )
-
-add_custom_target(sercon)
-set_target_properties(sercon PROPERTIES
- PRIORITY "SCHED_PRIORITY_DEFAULT"
- MAIN "sercon" STACK_MAIN "2048")
-
-add_custom_target(serdis)
-set_target_properties(serdis PROPERTIES
- PRIORITY "SCHED_PRIORITY_DEFAULT"
- MAIN "serdis" STACK_MAIN "2048")
diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake
index b72c5a8190..7e5d1c5c26 100644
--- a/cmake/configs/nuttx_px4fmu-v2_test.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake
@@ -94,10 +94,9 @@ set(config_module_list
modules/land_detector
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
modules/attitude_estimator_q
- #modules/ekf_att_pos_estimator
modules/position_estimator_inav
modules/local_position_estimator
modules/ekf2
diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake
index 5538ffe35a..d7d4058ab1 100644
--- a/cmake/configs/posix_bebop_default.cmake
+++ b/cmake/configs/posix_bebop_default.cmake
@@ -37,10 +37,8 @@ set(config_module_list
systemcmds/perf
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
- #modules/attitude_estimator_ekf
- modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
modules/local_position_estimator
diff --git a/cmake/configs/posix_eagle_legacy_driver_default.cmake b/cmake/configs/posix_eagle_legacy_driver_default.cmake
index ec172e7602..dc9b3049c9 100644
--- a/cmake/configs/posix_eagle_legacy_driver_default.cmake
+++ b/cmake/configs/posix_eagle_legacy_driver_default.cmake
@@ -31,8 +31,10 @@ set(config_module_list
modules/mavlink
- modules/attitude_estimator_ekf
- modules/ekf_att_pos_estimator
+ modules/attitude_estimator_q
+ modules/position_estimator_inav
+ modules/local_position_estimator
+ modules/ekf2
modules/mc_pos_control
modules/mc_att_control
diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake
index ad28fddc81..dac386836e 100644
--- a/cmake/configs/posix_rpi_common.cmake
+++ b/cmake/configs/posix_rpi_common.cmake
@@ -36,10 +36,8 @@ set(config_module_list
systemcmds/perf
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
- #modules/attitude_estimator_ekf
- modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
modules/local_position_estimator
diff --git a/cmake/configs/posix_sdflight_default.cmake b/cmake/configs/posix_sdflight_default.cmake
index c43e51974c..733e6c584a 100644
--- a/cmake/configs/posix_sdflight_default.cmake
+++ b/cmake/configs/posix_sdflight_default.cmake
@@ -24,8 +24,10 @@ set(config_module_list
modules/mavlink
- modules/attitude_estimator_ekf
- modules/ekf_att_pos_estimator
+ modules/attitude_estimator_q
+ modules/position_estimator_inav
+ modules/local_position_estimator
+ modules/ekf2
modules/mc_pos_control
modules/mc_att_control
diff --git a/cmake/configs/posix_sitl_broadcast.cmake b/cmake/configs/posix_sitl_broadcast.cmake
index 9a9029f1c0..7060744447 100644
--- a/cmake/configs/posix_sitl_broadcast.cmake
+++ b/cmake/configs/posix_sitl_broadcast.cmake
@@ -33,10 +33,10 @@ set(config_module_list
modules/sensors
modules/simulator
modules/mavlink
- modules/attitude_estimator_ekf
modules/attitude_estimator_q
+ modules/position_estimator_inav
+ modules/local_position_estimator
modules/ekf2
- modules/ekf_att_pos_estimator
modules/position_estimator_inav
modules/navigator
modules/vtol_att_control
diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake
index 469432818f..bf08993de0 100644
--- a/cmake/configs/qurt_eagle_hil.cmake
+++ b/cmake/configs/qurt_eagle_hil.cmake
@@ -27,12 +27,12 @@ set(config_module_list
systemcmds/mixer
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
- #modules/attitude_estimator_ekf
- modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
+ modules/local_position_estimator
+ modules/ekf2
#
# Vehicle Control
diff --git a/cmake/configs/qurt_eagle_legacy_driver_default.cmake b/cmake/configs/qurt_eagle_legacy_driver_default.cmake
index f0fdb2dee5..fcba1a3e13 100644
--- a/cmake/configs/qurt_eagle_legacy_driver_default.cmake
+++ b/cmake/configs/qurt_eagle_legacy_driver_default.cmake
@@ -35,11 +35,11 @@ set(config_module_list
systemcmds/param
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
- modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
+ modules/local_position_estimator
modules/ekf2
#
diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake
index 16aa788edc..b6be755df3 100644
--- a/cmake/configs/qurt_eagle_travis.cmake
+++ b/cmake/configs/qurt_eagle_travis.cmake
@@ -35,12 +35,12 @@ set(config_module_list
systemcmds/mixer
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
- #modules/attitude_estimator_ekf
- modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
+ modules/local_position_estimator
+ modules/ekf2
#
# Vehicle Control
diff --git a/cmake/configs/qurt_sdflight_default.cmake b/cmake/configs/qurt_sdflight_default.cmake
index 195219f7af..890658e0dc 100644
--- a/cmake/configs/qurt_sdflight_default.cmake
+++ b/cmake/configs/qurt_sdflight_default.cmake
@@ -32,12 +32,11 @@ set(config_module_list
systemcmds/param
#
- # Estimation modules (EKF/ SO3 / other filters)
+ # Estimation modules
#
- #modules/attitude_estimator_ekf
- modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
+ modules/local_position_estimator
modules/ekf2
#
--
GitLab