Revert "cleanup"

This reverts commit 8ecb550331.
This commit is contained in:
Roman Bapst
2023-02-16 13:28:49 +03:00
committed by GitHub
parent 00a370b195
commit 8298fee2b0
4 changed files with 11 additions and 3 deletions
@@ -92,6 +92,7 @@ private:
bool _is_landed{false};
float _home_alt_msl{NAN};
matrix::Vector2d _home_lat_lon = matrix::Vector2d((double)NAN, (double)NAN);
bool _is_vtol{false};
VehicleType _vehicle_type{VehicleType::RotaryWing};
// internal flags to keep track of which checks failed
+3 -1
View File
@@ -1747,7 +1747,9 @@ Mission::check_mission_valid(bool force)
MissionFeasibilityChecker _missionFeasibilityChecker(_navigator);
_navigator->get_mission_result()->valid =
_missionFeasibilityChecker.checkMissionFeasible(_mission);
_missionFeasibilityChecker.checkMissionFeasible(_mission,
_param_mis_dist_1wp.get(),
_param_mis_dist_wps.get());
_navigator->get_mission_result()->seq_total = _mission.count;
_navigator->increment_mission_instance_count();
@@ -54,7 +54,8 @@
#include <px4_platform_common/events.h>
bool
MissionFeasibilityChecker::checkMissionFeasible(const mission_s &mission)
MissionFeasibilityChecker::checkMissionFeasible(const mission_s &mission,
float max_distance_to_1st_waypoint, float max_distance_between_waypoints)
{
// Reset warning flag
_navigator->get_mission_result()->warning = false;
@@ -56,6 +56,9 @@ private:
Navigator *_navigator{nullptr};
FeasibilityChecker _feasibility_checker;
bool _has_takeoff{false};
bool _has_landing{false};
bool checkGeofence(const mission_s &mission, float home_alt, bool home_valid);
public:
@@ -74,5 +77,6 @@ public:
/*
* Returns true if mission is feasible and false otherwise
*/
bool checkMissionFeasible(const mission_s &mission);
bool checkMissionFeasible(const mission_s &mission,
float max_distance_to_1st_waypoint, float max_distance_between_waypoints);
};