From 2e2db2432964ada11dbdd06c4cff55ad0e52f858 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 31 Dec 2018 10:13:41 -0800 Subject: [PATCH] Scan fixes --- src/MissionManager/FixedWingLandingComplexItem.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc index 9e26762f0..813205af6 100644 --- a/src/MissionManager/FixedWingLandingComplexItem.cc +++ b/src/MissionManager/FixedWingLandingComplexItem.cc @@ -373,7 +373,7 @@ bool FixedWingLandingComplexItem::scanForItem(QmlObjectListModel* visualItems, b MissionItem& missionItemLand = item->missionItem(); if (missionItemLand.command() != MAV_CMD_NAV_LAND || !(missionItemLand.frame() == MAV_FRAME_GLOBAL_RELATIVE_ALT || missionItemLand.frame() == MAV_FRAME_GLOBAL) || - missionItemLand.param1() != 0 || missionItemLand.param2() != 0 || missionItemLand.param3() != 0 || missionItemLand.param4() == 1.0) { + missionItemLand.param1() != 0 || missionItemLand.param2() != 0 || missionItemLand.param3() != 0 || missionItemLand.param4() != 0) { return false; } MAV_FRAME landPointFrame = missionItemLand.frame(); @@ -414,6 +414,7 @@ bool FixedWingLandingComplexItem::scanForItem(QmlObjectListModel* visualItems, b } MissionItem& missionItemDoLandStart = item->missionItem(); if (missionItemDoLandStart.command() != MAV_CMD_DO_LAND_START || + missionItemDoLandStart.frame() != MAV_FRAME_MISSION || missionItemDoLandStart.param1() != 0 || missionItemDoLandStart.param2() != 0 || missionItemDoLandStart.param3() != 0 || missionItemDoLandStart.param4() != 0|| missionItemDoLandStart.param5() != 0|| missionItemDoLandStart.param6() != 0) { return false; } -- 2.22.0