Merged upstream master, add missing change

This commit is contained in:
Kynos
2014-06-30 01:55:40 +02:00
parent 503ebddc1b
commit 43b9d96cf4
+10 -10
View File
@@ -669,16 +669,16 @@ protected:
if (gps_sub->update(&gps_time, &gps)) { if (gps_sub->update(&gps_time, &gps)) {
mavlink_msg_gps_raw_int_send(_channel, mavlink_msg_gps_raw_int_send(_channel,
gps->timestamp_position, gps.timestamp_position,
gps->fix_type, gps.fix_type,
gps->lat, gps.lat,
gps->lon, gps.lon,
gps->alt, gps.alt,
cm_uint16_from_m_float(gps->eph), cm_uint16_from_m_float(gps.eph),
cm_uint16_from_m_float(gps->epv), cm_uint16_from_m_float(gps.epv),
gps->vel_m_s * 100.0f, gps.vel_m_s * 100.0f,
_wrap_2pi(gps->cog_rad) * M_RAD_TO_DEG_F * 1e2f, _wrap_2pi(gps.cog_rad) * M_RAD_TO_DEG_F * 1e2f,
gps->satellites_used); gps.satellites_used);
} }
} }
}; };