fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ekf2: move aux global position fusion to aid_sources/aux_global_position

Browse Source
This commit is contained in:
Daniel Agar 2024-05-01 21:43:48 -04:00
parent b8d46e60a5
commit e262fde4dc
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/ekf2/CMakeLists.txt
View File

@ -140,7 +140,7 @@ if(CONFIG_EKF2_AIRSPEED)
endif()
if(CONFIG_EKF2_AUX_GLOBAL_POSITION)
list(APPEND EKF_SRCS EKF/aux_global_position.cpp)
list(APPEND EKF_SRCS EKF/aid_sources/aux_global_position/aux_global_position.cpp)
endif()
if(CONFIG_EKF2_AUXVEL)

2
src/modules/ekf2/EKF/CMakeLists.txt
View File

@ -60,7 +60,7 @@ if(CONFIG_EKF2_AIRSPEED)
endif()
if(CONFIG_EKF2_AUX_GLOBAL_POSITION)
list(APPEND EKF_SRCS aux_global_position.cpp)
list(APPEND EKF_SRCS aid_sources/aux_global_position/aux_global_position.cpp)
endif()
if(CONFIG_EKF2_AUXVEL)

2
src/modules/ekf2/EKF/aux_global_position.cpp → src/modules/ekf2/EKF/aid_sources/aux_global_position/aux_global_position.cpp
View File

@ -33,7 +33,7 @@
#include "ekf.h"
#include "aux_global_position.hpp"
#include "aid_sources/aux_global_position/aux_global_position.hpp"
#if defined(CONFIG_EKF2_AUX_GLOBAL_POSITION) && defined(MODULE_NAME)

4
src/modules/ekf2/EKF/aux_global_position.hpp → src/modules/ekf2/EKF/aid_sources/aux_global_position/aux_global_position.hpp
View File

@ -42,8 +42,8 @@
// WelfordMean for init?
// WelfordMean for rate
#include "common.h"
#include "RingBuffer.h"
#include "../../common.h"
#include "../../RingBuffer.h"
#if defined(CONFIG_EKF2_AUX_GLOBAL_POSITION) && defined(MODULE_NAME)

2
src/modules/ekf2/EKF/ekf.h
View File

@ -63,7 +63,7 @@
#include "aid_sources/ZeroVelocityUpdate.hpp"
#if defined(CONFIG_EKF2_AUX_GLOBAL_POSITION)
# include "aux_global_position.hpp"
# include "aid_sources/aux_global_position/aux_global_position.hpp"
#endif // CONFIG_EKF2_AUX_GLOBAL_POSITION
enum class Likelihood { LOW, MEDIUM, HIGH };