From 21435bd32bf306cee015251a6d2d0dacef01be2e Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 9 Mar 2020 12:34:15 +0100 Subject: [PATCH] Report preflight and pre-arm checks from period checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change we are reporting any issues we find with the periodic check. Co-Authored-By: Beat Küng --- src/modules/commander/Commander.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp index 3a605cf87b..3e5b8025ea 100644 --- a/src/modules/commander/Commander.cpp +++ b/src/modules/commander/Commander.cpp @@ -2255,8 +2255,8 @@ Commander::run() // Evaluate current prearm status if (!armed.armed) { bool preflight_check_res = PreFlightCheck::preflightCheck(nullptr, status, status_flags, true, true, true, 30_s); - bool prearm_check_res = PreFlightCheck::preArmCheck(nullptr, status_flags, safety_s{}, - PreFlightCheck::arm_requirements_t{}, status); + bool prearm_check_res = PreFlightCheck::preArmCheck(nullptr, status_flags, _safety, + _arm_requirements, status); set_health_flags(subsystem_info_s::SUBSYSTEM_TYPE_PREARM_CHECK, true, true, (preflight_check_res && prearm_check_res), status); }