From 3545ba97caf8041d1928784635035dcd05287336 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 25 Jan 2020 10:27:14 -0500
Subject: [PATCH] commander: don't run preflightCheck during calibration on
 reconnect

---
 src/modules/commander/Commander.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp
index 10b3fe169b..70b8dc270b 100644
--- a/src/modules/commander/Commander.cpp
+++ b/src/modules/commander/Commander.cpp
@@ -3564,7 +3564,7 @@ void Commander::data_link_check()
 						status.data_link_lost = false;
 						_status_changed = true;
 
-						if (!armed.armed) {
+						if (!armed.armed && !status_flags.condition_calibration_enabled) {
 							// make sure to report preflight check failures to a connecting GCS
 							PreFlightCheck::preflightCheck(&mavlink_log_pub, status, status_flags,
 										       _arm_requirements.global_position, true, true, hrt_elapsed_time(&_boot_timestamp));