From bc4d37c91ee6a96ba2deca923724546e81c66536 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 8 Sep 2015 14:29:22 +1000 Subject: [PATCH] GCS_MAVLink: added severity to send_statustext_all() --- libraries/GCS_MAVLink/GCS.h | 2 +- libraries/GCS_MAVLink/GCS_Common.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS.h b/libraries/GCS_MAVLink/GCS.h index 69502d8751..73b3619c22 100644 --- a/libraries/GCS_MAVLink/GCS.h +++ b/libraries/GCS_MAVLink/GCS.h @@ -163,7 +163,7 @@ public: connections. This function is static so it can be called from any library */ - static void send_statustext_all(const prog_char_t *fmt, ...); + static void send_statustext_all(MAV_SEVERITY severity, const prog_char_t *fmt, ...); /* send a MAVLink message to all components with this vehicle's system id diff --git a/libraries/GCS_MAVLink/GCS_Common.cpp b/libraries/GCS_MAVLink/GCS_Common.cpp index 877452c429..47327c81cb 100644 --- a/libraries/GCS_MAVLink/GCS_Common.cpp +++ b/libraries/GCS_MAVLink/GCS_Common.cpp @@ -1169,7 +1169,7 @@ void GCS_MAVLINK::send_ahrs(AP_AHRS &ahrs) /* send a statustext message to all active MAVLink connections */ -void GCS_MAVLINK::send_statustext_all(const prog_char_t *fmt, ...) +void GCS_MAVLINK::send_statustext_all(MAV_SEVERITY severity, const prog_char_t *fmt, ...) { for (uint8_t i=0; ivsnprintf_P((char *)msg2, sizeof(msg2), fmt, arg_list); va_end(arg_list); mavlink_msg_statustext_send(chan, - MAV_SEVERITY_CRITICAL, + severity, msg2); } }