forked from Archive/PX4-Autopilot
MissionFeasibilityCheck: rename checkGeofence to checkMissionAgainstGeofence()
Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
This commit is contained in:
parent
56bfe41f10
commit
f8f4ea2fee
|
@ -97,7 +97,7 @@ MissionFeasibilityChecker::checkMissionFeasible(const mission_s &mission)
|
||||||
|
|
||||||
failed |= _feasibility_checker.someCheckFailed();
|
failed |= _feasibility_checker.someCheckFailed();
|
||||||
|
|
||||||
failed |= !checkGeofence(mission, _navigator->get_home_position()->alt, home_valid);
|
failed |= !checkMissionAgainstGeofence(mission, _navigator->get_home_position()->alt, home_valid);
|
||||||
|
|
||||||
_navigator->get_mission_result()->warning = failed;
|
_navigator->get_mission_result()->warning = failed;
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ MissionFeasibilityChecker::checkMissionFeasible(const mission_s &mission)
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
MissionFeasibilityChecker::checkGeofence(const mission_s &mission, float home_alt, bool home_valid)
|
MissionFeasibilityChecker::checkMissionAgainstGeofence(const mission_s &mission, float home_alt, bool home_valid)
|
||||||
{
|
{
|
||||||
if (_navigator->get_geofence().isHomeRequired() && !home_valid) {
|
if (_navigator->get_geofence().isHomeRequired() && !home_valid) {
|
||||||
mavlink_log_critical(_navigator->get_mavlink_log_pub(), "Geofence requires valid home position\t");
|
mavlink_log_critical(_navigator->get_mavlink_log_pub(), "Geofence requires valid home position\t");
|
||||||
|
|
|
@ -57,7 +57,7 @@ private:
|
||||||
DatamanClient &_dataman_client;
|
DatamanClient &_dataman_client;
|
||||||
FeasibilityChecker _feasibility_checker;
|
FeasibilityChecker _feasibility_checker;
|
||||||
|
|
||||||
bool checkGeofence(const mission_s &mission, float home_alt, bool home_valid);
|
bool checkMissionAgainstGeofence(const mission_s &mission, float home_alt, bool home_valid);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MissionFeasibilityChecker(Navigator *navigator, DatamanClient &dataman_client) :
|
MissionFeasibilityChecker(Navigator *navigator, DatamanClient &dataman_client) :
|
||||||
|
|
Loading…
Reference in New Issue