yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 09:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages

Browse Source 
Conflicts:
	src/modules/navigator/navigator_main.cpp
This commit is contained in:
Thomas Gubler
2014-08-21 11:05:56 +02:00
parent 57a250f946 8f65d52aca
commit 3a0bb9c64b
11 changed files with 840 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/mavlink/mavlink_main.cpp
View File

@@ -1662,6 +1662,8 @@ Mavlink::display_status()
printf("\tGCS heartbeat:\t%llu us ago\n", hrt_elapsed_time(&_rstatus.heartbeat_time));
}
printf("\tmavlink chan: #%u\n", _channel);
if (_rstatus.timestamp > 0) {
printf("\ttype:\t\t");