diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-21 11:05:56 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-21 11:05:56 +0200 |
| commit | 3a0bb9c64b933a102f75d64d03de7ad0f6df4308 (patch) | |
| tree | 15bd9a527f044e232478577512a79cb46e340cca /src/modules/mavlink/mavlink_main.cpp | |
| parent | 57a250f9461f0ab8fe10cf6988f9e2dfd269bdf2 (diff) | |
| parent | 8f65d52acad104629285d10428c3d52f468dacb5 (diff) | |
| download | px4-firmware-3a0bb9c64b933a102f75d64d03de7ad0f6df4308.tar.gz px4-firmware-3a0bb9c64b933a102f75d64d03de7ad0f6df4308.tar.bz2 px4-firmware-3a0bb9c64b933a102f75d64d03de7ad0f6df4308.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 8b7fc4650..1e5bd661f 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -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"); |