fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-09 19:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FeasibilityChecker: Fixed bug and added unit test for it"

Browse Source 
This reverts commit 7ef2bff0a2.
This commit is contained in:
Roman Bapst
2023-02-16 13:28:49 +03:00
committed by GitHub
parent 759d33d00e
commit 54da35b7ea
3 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/MissionFeasibility/FeasibilityChecker.cpp
+8 -9
View File
@@ -160,10 +160,10 @@ void FeasibilityChecker::processNextItem(mission_item_s &mission_item, const int
doCommonChecks(mission_item, current_index);
if (_vehicle_type == VehicleType::Vtol) {
doVtolChecks(mission_item, current_index, total_count - 1);
doVtolChecks(mission_item, current_index);
} else if (_vehicle_type == VehicleType::FixedWing) {
doFixedWingChecks(mission_item, current_index, total_count - 1);
doFixedWingChecks(mission_item, current_index);
} else if (_vehicle_type == VehicleType::RotaryWing) {
doMulticopterChecks(mission_item, current_index);
@@ -199,18 +199,18 @@ void FeasibilityChecker::doCommonChecks(mission_item_s &mission_item, const int
}
}
void FeasibilityChecker::doVtolChecks(mission_item_s &mission_item, const int current_index, const int last_index)
void FeasibilityChecker::doVtolChecks(mission_item_s &mission_item, const int current_index)
{
if (!_land_pattern_validity_failed) {
_land_pattern_validity_failed = !checkLandPatternValidity(mission_item, current_index, last_index);
_land_pattern_validity_failed = !checkLandPatternValidity(mission_item, current_index);
}
}
void FeasibilityChecker::doFixedWingChecks(mission_item_s &mission_item, const int current_index, const int last_index)
void FeasibilityChecker::doFixedWingChecks(mission_item_s &mission_item, const int current_index)
{
if (!_land_pattern_validity_failed) {
_land_pattern_validity_failed = !checkLandPatternValidity(mission_item, current_index, last_index);
_land_pattern_validity_failed = !checkLandPatternValidity(mission_item, current_index);
}
if (!_fixed_wing_land_approach_failed) {
@@ -488,8 +488,7 @@ bool FeasibilityChecker::checkFixedWindLandApproach(mission_item_s &mission_item
return true;
}
bool FeasibilityChecker::checkLandPatternValidity(mission_item_s &mission_item, const int current_index,
const int last_index)
bool FeasibilityChecker::checkLandPatternValidity(mission_item_s &mission_item, const int current_index)
{
// if DO_LAND_START found then require valid landing AFTER
@@ -529,7 +528,7 @@ bool FeasibilityChecker::checkLandPatternValidity(mission_item_s &mission_item,
}
}
if (current_index == last_index && land_start_found && (_do_land_start_index > _landing_approach_index)) {
if (land_start_found && (_do_land_start_index > _landing_approach_index)) {
mavlink_log_critical(_mavlink_log_pub, "Mission rejected: invalid land start.\t");
events::send(events::ID("navigator_mis_invalid_land"), {events::Log::Error, events::LogInternal::Info},
"Mission rejected: invalid land start");