Browse Source

Vehicle: update HealthAndArmingCheck

QGC4.4
Beat Küng 3 years ago
parent
commit
6a76ba2628
  1. 2
      libs/libevents/libevents
  2. 7
      src/Vehicle/HealthAndArmingCheckReport.cc

2
libs/libevents/libevents

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit a8ca26efd605c5ff774bda756870ecd27d8dcee3
Subproject commit 82dabdb914d7bd640c281900e2852d0afc074b68

7
src/Vehicle/HealthAndArmingCheckReport.cc

@ -61,12 +61,13 @@ void HealthAndArmingCheckReport::update(uint8_t compid, const events::HealthAndA @@ -61,12 +61,13 @@ void HealthAndArmingCheckReport::update(uint8_t compid, const events::HealthAndA
description.replace("\n", "<br/>"), 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;

Loading…
Cancel
Save