From 6a76ba26289a3500d6469c5ff0a485f5775418c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Wed, 31 Aug 2022 15:31:21 +0200 Subject: [PATCH] Vehicle: update HealthAndArmingCheck --- libs/libevents/libevents | 2 +- src/Vehicle/HealthAndArmingCheckReport.cc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/libevents/libevents b/libs/libevents/libevents index a8ca26e..82dabdb 160000 --- a/libs/libevents/libevents +++ b/libs/libevents/libevents @@ -1 +1 @@ -Subproject commit a8ca26efd605c5ff774bda756870ecd27d8dcee3 +Subproject commit 82dabdb914d7bd640c281900e2852d0afc074b68 diff --git a/src/Vehicle/HealthAndArmingCheckReport.cc b/src/Vehicle/HealthAndArmingCheckReport.cc index 71abd0a..4232573 100644 --- a/src/Vehicle/HealthAndArmingCheckReport.cc +++ b/src/Vehicle/HealthAndArmingCheckReport.cc @@ -61,12 +61,13 @@ void HealthAndArmingCheckReport::update(uint8_t compid, const events::HealthAndA description.replace("\n", "
"), severity)); } - _canArm = results.canArmAndRun(flightModeGroup); + _canArm = results.canArm(flightModeGroup); if (_missionModeGroup != -1) { - _canStartMission = results.canArmAndRun(_missionModeGroup); + // TODO: use results.canRun(_missionModeGroup) while armed + _canStartMission = results.canArm(_missionModeGroup); } if (_takeoffModeGroup != -1) { - _canTakeoff = results.canArmAndRun(_takeoffModeGroup); + _canTakeoff = results.canArm(_takeoffModeGroup); } const auto& healthComponents = results.healthComponents().health_components;