diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-27 14:42:30 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-27 14:42:30 +0400 |
| commit | fc0ffbbd63036d094ad61a328e406c64742b481d (patch) | |
| tree | c9407998005a7f5bbaa2f0c0e7d327163c86de74 /src/modules/mavlink | |
| parent | 6a04d13e733700e7e2e90c20399889a79eae293a (diff) | |
| parent | 464df9c5e8cac88c24ee080337970df74edcd239 (diff) | |
| download | px4-firmware-fc0ffbbd63036d094ad61a328e406c64742b481d.tar.gz px4-firmware-fc0ffbbd63036d094ad61a328e406c64742b481d.tar.bz2 px4-firmware-fc0ffbbd63036d094ad61a328e406c64742b481d.zip | |
Merge branch 'ekf_acc_comp' into vector_control2
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index b4f7f2dfe..f8694ef28 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -579,6 +579,7 @@ handle_message(mavlink_message_t *msg) hil_gps.alt = gps.alt; hil_gps.eph_m = (float)gps.eph * 1e-2f; // from cm to m hil_gps.epv_m = (float)gps.epv * 1e-2f; // from cm to m + hil_gps.timestamp_variance = gps.time_usec; hil_gps.s_variance_m_s = 5.0f; hil_gps.p_variance_m = hil_gps.eph_m * hil_gps.eph_m; hil_gps.vel_m_s = (float)gps.vel * 1e-2f; // from cm/s to m/s @@ -590,6 +591,7 @@ handle_message(mavlink_message_t *msg) if (heading_rad > M_PI_F) heading_rad -= 2.0f * M_PI_F; + hil_gps.timestamp_velocity = gps.time_usec; hil_gps.vel_n_m_s = gps.vn * 1e-2f; // from cm to m hil_gps.vel_e_m_s = gps.ve * 1e-2f; // from cm to m hil_gps.vel_d_m_s = gps.vd * 1e-2f; // from cm to m |