From eec64c5c0fdbac4ab451a10ae32db7a7188fe49d Mon Sep 17 00:00:00 2001 From: Thomas Stauber <48206725+ThomasRigi@users.noreply.github.com> Date: Fri, 11 Dec 2020 10:13:34 +0100 Subject: [PATCH] More compact if statement Co-authored-by: Silvan Fuhrer --- src/modules/mavlink/mavlink_receiver.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 99a7f75fcf..22166945a8 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -3134,7 +3134,13 @@ MavlinkReceiver::get_offb_cruising_speed() vehicle_status_s vehicle_status{}; _vehicle_status_sub.copy(&vehicle_status); - if (vehicle_status.vehicle_type == vehicle_status_s::VEHICLE_TYPE_ROTARY_WING) { + if (vehicle_status.vehicle_type == vehicle_status_s::VEHICLE_TYPE_ROTARY_WING && _offb_cruising_speed_mc > 0.0f) { + return _offb_cruising_speed_mc; + } else if (vehicle_status.vehicle_type == vehicle_status_s::VEHICLE_TYPE_FIXED_WING && _offb_cruising_speed_fw > 0.0f) { + return _offb_cruising_speed_fw; + } else { + return -1.0f; + } if (_offb_cruising_speed_mc > 0.0f) { return _offb_cruising_speed_mc;