diff options
| author | Andrea Nistico <andrea.nistic@gmail.com> | 2015-04-24 16:54:46 +0200 |
|---|---|---|
| committer | Andrea Nistico <andrea.nistic@gmail.com> | 2015-04-24 16:54:46 +0200 |
| commit | 3527a2fe89857d6c0242e058f50d95baaadc57c1 (patch) | |
| tree | a8f9fc0e3def37772224effcfe37c3d70d4b0e64 | |
| parent | 72f9a3d8b0f1d421794a6dd2c56c501c9d25e78f (diff) | |
| parent | 1f5775615ffb04f22456795ea39cb1402ae51d5f (diff) | |
| download | px4-firmware-3527a2fe89857d6c0242e058f50d95baaadc57c1.tar.gz px4-firmware-3527a2fe89857d6c0242e058f50d95baaadc57c1.tar.bz2 px4-firmware-3527a2fe89857d6c0242e058f50d95baaadc57c1.zip | |
Merge branch 'optitrack_integration'
sdlog and att_estimator_ekf update
| -rwxr-xr-x | src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp b/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp index b2a3572a7..68780d5dd 100755 --- a/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp +++ b/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp @@ -465,8 +465,8 @@ int attitude_estimator_ekf_thread_main(int argc, char *argv[]) math::Vector<3> v(1.0f, 0.0f, 0.4f); - math::Vector<3> vn = Rvis * v; - + math::Vector<3> vn = Rvis.transposed() * v; //Rvis is Rwr (robot respect to world) while v is respect to world. Hence Rvis must be transposed having (Rwr)' * Vw + // Rrw * Vw = vn. This way we have consistency z_k[6] = vn(0); z_k[7] = vn(1); z_k[8] = vn(2); |