commander: skip continuous preflight check if calibrating

This commit is contained in:
Daniel Agar
2020-05-04 13:46:31 -04:00
parent 6705ac3e3b
commit 7bb256f4b7
+2 -3
View File
@@ -2315,10 +2315,9 @@ Commander::run()
status_flags.timestamp = hrt_absolute_time();
// Evaluate current prearm status
if (!armed.armed) {
if (!armed.armed && !status_flags.condition_calibration_enabled) {
bool preflight_check_res = PreFlightCheck::preflightCheck(nullptr, status, status_flags, true, false, true, 30_s);
bool prearm_check_res = PreFlightCheck::preArmCheck(nullptr, status_flags, _safety,
_arm_requirements, status, false);
bool prearm_check_res = PreFlightCheck::preArmCheck(nullptr, status_flags, _safety, _arm_requirements, status, false);
set_health_flags(subsystem_info_s::SUBSYSTEM_TYPE_PREARM_CHECK, true, true, (preflight_check_res
&& prearm_check_res), status);
}