Browse Source

Moved James Gopperts EKF to the new world

sbg
Lorenz Meier 12 years ago
parent
commit
76a30108d2
  1. 2
      makefiles/config_px4fmu_default.mk
  2. 0
      src/modules/att_pos_estimator_ekf/KalmanNav.cpp
  3. 0
      src/modules/att_pos_estimator_ekf/KalmanNav.hpp
  4. 4
      src/modules/att_pos_estimator_ekf/kalman_main.cpp
  5. 11
      src/modules/att_pos_estimator_ekf/module.mk
  6. 0
      src/modules/att_pos_estimator_ekf/params.c

2
makefiles/config_px4fmu_default.mk

@ -54,6 +54,7 @@ MODULES += modules/mavlink_onboard @@ -54,6 +54,7 @@ MODULES += modules/mavlink_onboard
#
MODULES += modules/attitude_estimator_ekf
MODULES += modules/position_estimator_mc
MODULES += modules/att_pos_estimator_ekf
#
# Logging
@ -78,7 +79,6 @@ BUILTIN_COMMANDS := \ @@ -78,7 +79,6 @@ BUILTIN_COMMANDS := \
$(call _B, control_demo, , 2048, control_demo_main ) \
$(call _B, fixedwing_att_control, SCHED_PRIORITY_MAX-30, 2048, fixedwing_att_control_main ) \
$(call _B, fixedwing_pos_control, SCHED_PRIORITY_MAX-30, 2048, fixedwing_pos_control_main ) \
$(call _B, kalman_demo, SCHED_PRIORITY_MAX-30, 2048, kalman_demo_main ) \
$(call _B, math_demo, , 8192, math_demo_main ) \
$(call _B, multirotor_att_control, SCHED_PRIORITY_MAX-15, 2048, multirotor_att_control_main) \
$(call _B, multirotor_pos_control, SCHED_PRIORITY_MAX-25, 2048, multirotor_pos_control_main) \

0
apps/examples/kalman_demo/KalmanNav.cpp → src/modules/att_pos_estimator_ekf/KalmanNav.cpp

0
apps/examples/kalman_demo/KalmanNav.hpp → src/modules/att_pos_estimator_ekf/KalmanNav.hpp

4
apps/examples/kalman_demo/kalman_demo.cpp → src/modules/att_pos_estimator_ekf/kalman_main.cpp

@ -55,7 +55,7 @@ static int deamon_task; /**< Handle of deamon task / thread */ @@ -55,7 +55,7 @@ static int deamon_task; /**< Handle of deamon task / thread */
/**
* Deamon management function.
*/
extern "C" __EXPORT int kalman_demo_main(int argc, char *argv[]);
extern "C" __EXPORT int att_pos_estimator_ekf_main(int argc, char *argv[]);
/**
* Mainloop of deamon.
@ -85,7 +85,7 @@ usage(const char *reason) @@ -85,7 +85,7 @@ usage(const char *reason)
* The actual stack size should be set in the call
* to task_create().
*/
int kalman_demo_main(int argc, char *argv[])
int att_pos_estimator_ekf_main(int argc, char *argv[])
{
if (argc < 1)

11
apps/examples/kalman_demo/Makefile → src/modules/att_pos_estimator_ekf/module.mk

@ -35,8 +35,11 @@ @@ -35,8 +35,11 @@
# Basic example application
#
APPNAME = kalman_demo
PRIORITY = SCHED_PRIORITY_MAX - 30
STACKSIZE = 2048
MODULE_COMMAND = att_pos_estimator_ekf
include $(APPDIR)/mk/app.mk
# XXX this might be intended for the spawned deamon, validate
MODULE_PRIORITY = "SCHED_PRIORITY_MAX-30"
SRCS = kalman_main.cpp \
KalmanNav.cpp \
params.c

0
apps/examples/kalman_demo/params.c → src/modules/att_pos_estimator_ekf/params.c

Loading…
Cancel
Save