diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-19 14:10:25 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-19 14:10:25 +0400 |
| commit | ba612c3ee8b88b9352e7cfa723997887dd736b76 (patch) | |
| tree | 8b101b50259ffebd4de12891f4f684d6d84c3f53 /src/modules/att_pos_estimator_ekf/KalmanNav.hpp | |
| parent | e3a5a384d7b3678d1cbef63dc28fbe9a8f1de940 (diff) | |
| download | px4-firmware-ba612c3ee8b88b9352e7cfa723997887dd736b76.tar.gz px4-firmware-ba612c3ee8b88b9352e7cfa723997887dd736b76.tar.bz2 px4-firmware-ba612c3ee8b88b9352e7cfa723997887dd736b76.zip | |
mathlib fixes
Diffstat (limited to 'src/modules/att_pos_estimator_ekf/KalmanNav.hpp')
| -rw-r--r-- | src/modules/att_pos_estimator_ekf/KalmanNav.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/att_pos_estimator_ekf/KalmanNav.hpp b/src/modules/att_pos_estimator_ekf/KalmanNav.hpp index a69bde1a6..46ee4b6c8 100644 --- a/src/modules/att_pos_estimator_ekf/KalmanNav.hpp +++ b/src/modules/att_pos_estimator_ekf/KalmanNav.hpp @@ -125,17 +125,17 @@ public: virtual void updateParams(); protected: // kalman filter - math::Matrix F; /**< Jacobian(f,x), where dx/dt = f(x,u) */ - math::Matrix G; /**< noise shaping matrix for gyro/accel */ - math::Matrix P; /**< state covariance matrix */ - math::Matrix P0; /**< initial state covariance matrix */ - math::Matrix V; /**< gyro/ accel noise matrix */ - math::Matrix HAtt; /**< attitude measurement matrix */ - math::Matrix RAtt; /**< attitude measurement noise matrix */ - math::Matrix HPos; /**< position measurement jacobian matrix */ - math::Matrix RPos; /**< position measurement noise matrix */ + math::Matrix<9,9> F; /**< Jacobian(f,x), where dx/dt = f(x,u) */ + math::Matrix<9,6> G; /**< noise shaping matrix for gyro/accel */ + math::Matrix<9,9> P; /**< state covariance matrix */ + math::Matrix<9,9> P0; /**< initial state covariance matrix */ + math::Matrix<6,6> V; /**< gyro/ accel noise matrix */ + math::Matrix<4,9> HAtt; /**< attitude measurement matrix */ + math::Matrix<4,4> RAtt; /**< attitude measurement noise matrix */ + math::Matrix<6,9> HPos; /**< position measurement jacobian matrix */ + math::Matrix<6,6> RPos; /**< position measurement noise matrix */ // attitude - math::Dcm C_nb; /**< direction cosine matrix from body to nav frame */ + math::Matrix<3,3> C_nb; /**< direction cosine matrix from body to nav frame */ math::Quaternion q; /**< quaternion from body to nav frame */ // subscriptions control::UOrbSubscription<sensor_combined_s> _sensors; /**< sensors sub. */ |