From 0e5a91bb1b8bb27ed7809ff5f204b5c7b2893530 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 8 Aug 2016 11:52:24 +0900 Subject: [PATCH] Tracker: fix return results from preflight calibration Was always returning success even in cases where it failed Issue found by Coverity --- AntennaTracker/GCS_Mavlink.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index afa3a4ba48..81e695b49c 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -580,9 +580,11 @@ void GCS_MAVLINK_Tracker::handleMessage(mavlink_message_t* msg) tracker.init_barometer(false); // zero the altitude difference on next baro update tracker.nav_status.need_altitude_calibration = true; + result = MAV_RESULT_ACCEPTED; } if (is_equal(packet.param4,1.0f)) { // Can't trim radio + result = MAV_RESULT_UNSUPPORTED; } else if (is_equal(packet.param5,1.0f)) { result = MAV_RESULT_ACCEPTED; // start with gyro calibration @@ -609,7 +611,6 @@ void GCS_MAVLINK_Tracker::handleMessage(mavlink_message_t* msg) result = MAV_RESULT_FAILED; } } - result = MAV_RESULT_ACCEPTED; break; }