aboutsummaryrefslogtreecommitdiff
path: root/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
diff options
context:
space:
mode:
authorJohan Jansen <jnsn.johan@gmail.com>2015-02-05 13:25:05 +0100
committerJohan Jansen <jnsn.johan@gmail.com>2015-02-11 13:38:59 +0100
commit723c138b09663128fe2f5309bbe77b4ce22ef5fa (patch)
tree20f0623184ebcaf32bc07c83560a9f6de62cd090 /src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
parent83298110c1dcb37a734d0140b7067ad7dd267e26 (diff)
downloadpx4-firmware-723c138b09663128fe2f5309bbe77b4ce22ef5fa.tar.gz
px4-firmware-723c138b09663128fe2f5309bbe77b4ce22ef5fa.tar.bz2
px4-firmware-723c138b09663128fe2f5309bbe77b4ce22ef5fa.zip
AttPosEKF: Move documentation to header file
Diffstat (limited to 'src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp')
-rw-r--r--src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp36
1 files changed, 14 insertions, 22 deletions
diff --git a/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp b/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
index eabef2798..fb88fa8e8 100644
--- a/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
+++ b/src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
@@ -332,13 +332,13 @@ private:
namespace estimator
{
-/* oddly, ERROR is not defined for c++ */
-#ifdef ERROR
-# undef ERROR
-#endif
-static const int ERROR = -1;
+ /* oddly, ERROR is not defined for c++ */
+ #ifdef ERROR
+ # undef ERROR
+ #endif
+ static const int ERROR = -1;
-AttitudePositionEstimatorEKF *g_estimator = nullptr;
+ AttitudePositionEstimatorEKF *g_estimator = nullptr;
}
AttitudePositionEstimatorEKF::AttitudePositionEstimatorEKF() :
@@ -525,16 +525,14 @@ AttitudePositionEstimatorEKF::~AttitudePositionEstimatorEKF()
estimator::g_estimator = nullptr;
}
-int
-AttitudePositionEstimatorEKF::enable_logging(bool logging)
+int AttitudePositionEstimatorEKF::enable_logging(bool logging)
{
_ekf_logging = logging;
return 0;
}
-int
-AttitudePositionEstimatorEKF::parameters_update()
+int AttitudePositionEstimatorEKF::parameters_update()
{
param_get(_parameter_handles.vel_delay_ms, &(_parameters.vel_delay_ms));
@@ -578,8 +576,7 @@ AttitudePositionEstimatorEKF::parameters_update()
return OK;
}
-void
-AttitudePositionEstimatorEKF::vehicle_status_poll()
+void AttitudePositionEstimatorEKF::vehicle_status_poll()
{
bool vstatus_updated;
@@ -592,8 +589,7 @@ AttitudePositionEstimatorEKF::vehicle_status_poll()
}
}
-int
-AttitudePositionEstimatorEKF::check_filter_state()
+int AttitudePositionEstimatorEKF::check_filter_state()
{
/*
* CHECK IF THE INPUT DATA IS SANE
@@ -709,14 +705,12 @@ AttitudePositionEstimatorEKF::check_filter_state()
return check;
}
-void
-AttitudePositionEstimatorEKF::task_main_trampoline(int argc, char *argv[])
+void AttitudePositionEstimatorEKF::task_main_trampoline(int argc, char *argv[])
{
estimator::g_estimator->task_main();
}
-void
-AttitudePositionEstimatorEKF::task_main()
+void AttitudePositionEstimatorEKF::task_main()
{
_mavlink_fd = open(MAVLINK_LOG_DEVICE, 0);
@@ -1637,8 +1631,7 @@ AttitudePositionEstimatorEKF::task_main()
_exit(0);
}
-int
-AttitudePositionEstimatorEKF::start()
+int AttitudePositionEstimatorEKF::start()
{
ASSERT(_estimator_task == -1);
@@ -1658,8 +1651,7 @@ AttitudePositionEstimatorEKF::start()
return OK;
}
-void
-AttitudePositionEstimatorEKF::print_status()
+void AttitudePositionEstimatorEKF::print_status()
{
math::Quaternion q(_ekf->states[0], _ekf->states[1], _ekf->states[2], _ekf->states[3]);
math::Matrix<3, 3> R = q.to_dcm();