diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 12:22:55 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 12:22:55 +0200 |
| commit | 39dab45ac5f9321221eb86e23b0e203ae63f0936 (patch) | |
| tree | 7f3f99719a509586db29db0b7174b4e6fd2974ad /src/modules/mavlink/mavlink_receiver.cpp | |
| parent | d7394c7ef973e34d87187420444baad6fcf9854b (diff) | |
| parent | 2389a11af1249f657d85d36a5e71db83940a7959 (diff) | |
| download | px4-firmware-39dab45ac5f9321221eb86e23b0e203ae63f0936.tar.gz px4-firmware-39dab45ac5f9321221eb86e23b0e203ae63f0936.tar.bz2 px4-firmware-39dab45ac5f9321221eb86e23b0e203ae63f0936.zip | |
Merge branch 'master' into dataman_state_nav_rewrite
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index d654a6203..75e4e7160 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -740,7 +740,6 @@ MavlinkReceiver::handle_message_hil_gps(mavlink_message_t *msg) hil_gps.timestamp_variance = timestamp; hil_gps.s_variance_m_s = 5.0f; - hil_gps.p_variance_m = hil_gps.eph * hil_gps.eph; hil_gps.timestamp_velocity = timestamp; hil_gps.vel_m_s = (float)gps.vel * 1e-2f; // from cm/s to m/s @@ -750,9 +749,8 @@ MavlinkReceiver::handle_message_hil_gps(mavlink_message_t *msg) hil_gps.vel_ned_valid = true; hil_gps.cog_rad = _wrap_pi(gps.cog * M_DEG_TO_RAD_F * 1e-2f); - hil_gps.timestamp_satellites = timestamp; hil_gps.fix_type = gps.fix_type; - hil_gps.satellites_visible = gps.satellites_visible; + hil_gps.satellites_used = gps.satellites_visible; //TODO: rename mavlink_hil_gps_t sats visible to used? if (_gps_pub < 0) { _gps_pub = orb_advertise(ORB_ID(vehicle_gps_position), &hil_gps); |