From ec935cf0fe3287f15b9d91a0bcbbe728f3f76747 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 19 Sep 2017 10:43:55 -0700 Subject: [PATCH] GCS_MAVLink: refactor send_banner() to use AP_FWVersion --- libraries/GCS_MAVLink/GCS_Common.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS_Common.cpp b/libraries/GCS_MAVLink/GCS_Common.cpp index 014b3b95a8..7624445d4d 100644 --- a/libraries/GCS_MAVLink/GCS_Common.cpp +++ b/libraries/GCS_MAVLink/GCS_Common.cpp @@ -2005,9 +2005,10 @@ void GCS_MAVLINK::send_banner() const AP_FWVersion &fwver = get_fwver(); send_text(MAV_SEVERITY_INFO, fwver.fw_string); -#if defined(PX4_GIT_VERSION) && defined(NUTTX_GIT_VERSION) - send_text(MAV_SEVERITY_INFO, "PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION); -#endif + if (fwver.middleware_hash_str && fwver.os_hash_str) { + send_text(MAV_SEVERITY_INFO, "PX4: %s NuttX: %s", + fwver.middleware_hash_str, fwver.os_hash_str); + } // send system ID if we can char sysid[40];