MissionFeasibilityChecker geofence ignore NAV_CMD_DO_*

-closes #4040
This commit is contained in:
Daniel Agar
2016-03-22 06:54:41 +01:00
committed by Andreas Antener
parent c37cf7abd4
commit 408d147a18
3 changed files with 13 additions and 8 deletions
@@ -41,6 +41,7 @@
#include "mission_feasibility_checker.h"
#include "mission_block.h"
#include <geo/geo.h>
#include <math.h>
#include <mathlib/mathlib.h>
@@ -161,7 +162,9 @@ bool MissionFeasibilityChecker::checkGeofence(dm_item_t dm_current, size_t nMiss
return false;
}
if (!geofence.inside_polygon(missionitem.lat, missionitem.lon, missionitem.altitude)) {
if (MissionBlock::item_contains_position(&missionitem) &&
!geofence.inside_polygon(missionitem.lat, missionitem.lon, missionitem.altitude)) {
mavlink_log_critical(_mavlink_fd, "Geofence violation for waypoint %d", i);
return false;
}