fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 12:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into offboard2_merge

Browse Source 
Conflicts:
	src/modules/uORB/topics/rc_channels.h
This commit is contained in:
Julian Oes
2014-07-02 15:15:26 +02:00
parent fdceb8b062 f428ebb04f
commit 73d6121a9d
89 changed files with 1952 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_receiver.cpp
+1 -2
View File
@@ -728,9 +728,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);